Skip to content

Commit

Permalink
upgrade futures account service to v2 version (adshao#497)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wayne163
wayne163 authored Jul 29, 2023
1 parent 62587d0 commit e728846
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 10 deletions.
12 changes: 9 additions & 3 deletions v2/futures/account_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type GetAccountService struct {
func (s *GetAccountService) Do(ctx context.Context, opts ...RequestOption) (res *Account, err error) {
r := &request{
method: http.MethodGet,
endpoint: "/fapi/v1/account",
endpoint: "/fapi/v2/account",
secType: secTypeSigned,
}
data, _, err := s.c.callAPI(ctx, r, opts...)
Expand All @@ -73,6 +73,7 @@ type Account struct {
CanDeposit bool `json:"canDeposit"`
CanWithdraw bool `json:"canWithdraw"`
UpdateTime int64 `json:"updateTime"`
MultiAssetsMargin bool `json:"multiAssetsMargin"`
TotalInitialMargin string `json:"totalInitialMargin"`
TotalMaintMargin string `json:"totalMaintMargin"`
TotalWalletBalance string `json:"totalWalletBalance"`
Expand All @@ -98,6 +99,11 @@ type AccountAsset struct {
PositionInitialMargin string `json:"positionInitialMargin"`
UnrealizedProfit string `json:"unrealizedProfit"`
WalletBalance string `json:"walletBalance"`
CrossWalletBalance string `json:"crossWalletBalance"`
CrossUnPnl string `json:"crossUnPnl"`
AvailableBalance string `json:"availableBalance"`
MarginAvailable bool `json:"marginAvailable"`
UpdateTime int64 `json:"updateTime"`
}

// AccountPosition define account position
Expand All @@ -114,7 +120,7 @@ type AccountPosition struct {
MaxNotional string `json:"maxNotional"`
PositionSide PositionSideType `json:"positionSide"`
PositionAmt string `json:"positionAmt"`
Notional string `json:"notional"`
IsolatedWallet string `json:"isolatedWallet"`
BidNotional string `json:"bidNotional"`
AskNotional string `json:"askNotional"`
UpdateTime int64 `json:"updateTime"`
}
32 changes: 25 additions & 7 deletions v2/futures/account_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,20 @@ func (s *accountServiceTestSuite) TestGetAccount() {
"openOrderInitialMargin": "0.00000000",
"positionInitialMargin": "0.33683000",
"unrealizedProfit": "-0.44537584",
"walletBalance": "9.19485176"
"walletBalance": "9.19485176",
"crossWalletBalance": "23.72469206",
"crossUnPnl": "0.00000000",
"availableBalance": "126.72469206",
"marginAvailable": true,
"updateTime": 1625474304765
}
],
"canDeposit": true,
"canTrade": true,
"canWithdraw": true,
"feeTier": 2,
"maxWithdrawAmount": "8.41264592",
"multiAssetsMargin": false,
"positions": [
{
"isolated": false,
Expand All @@ -93,8 +99,8 @@ func (s *accountServiceTestSuite) TestGetAccount() {
"maxNotional": "250000",
"positionSide": "BOTH",
"positionAmt": "0.436",
"notional":"0.1234",
"isolatedWallet":"0.5678",
"bidNotional": "0",
"askNotional": "0",
"updateTime":1618646402359
}
],
Expand Down Expand Up @@ -128,13 +134,19 @@ func (s *accountServiceTestSuite) TestGetAccount() {
PositionInitialMargin: "0.33683000",
UnrealizedProfit: "-0.44537584",
WalletBalance: "9.19485176",
CrossWalletBalance: "23.72469206",
CrossUnPnl: "0.00000000",
AvailableBalance: "126.72469206",
MarginAvailable: true,
UpdateTime: 1625474304765,
},
},
CanTrade: true,
CanWithdraw: true,
CanDeposit: true,
FeeTier: 2,
MaxWithdrawAmount: "8.41264592",
MultiAssetsMargin: false,
Positions: []*AccountPosition{
{
Isolated: false,
Expand All @@ -149,8 +161,8 @@ func (s *accountServiceTestSuite) TestGetAccount() {
MaxNotional: "250000",
PositionSide: "BOTH",
PositionAmt: "0.436",
Notional: "0.1234",
IsolatedWallet: "0.5678",
BidNotional: "0",
AskNotional: "0",
UpdateTime: 1618646402359,
},
},
Expand Down Expand Up @@ -181,6 +193,7 @@ func (s *accountServiceTestSuite) assertAccountEqual(e, a *Account) {
r.Equal(e.TotalUnrealizedProfit, a.TotalUnrealizedProfit, "TotalUnrealizedProfit")
r.Equal(e.TotalWalletBalance, a.TotalWalletBalance, "TotalWalletBalance")
r.Equal(e.UpdateTime, a.UpdateTime, "UpdateTime")
r.Equal(e.MultiAssetsMargin, a.MultiAssetsMargin, "MultiAssetsMargin")

r.Len(a.Assets, len(e.Assets))
for i := 0; i < len(a.Assets); i++ {
Expand All @@ -193,6 +206,11 @@ func (s *accountServiceTestSuite) assertAccountEqual(e, a *Account) {
r.Equal(e.Assets[i].PositionInitialMargin, a.Assets[i].PositionInitialMargin, "PositionInitialMargin")
r.Equal(e.Assets[i].UnrealizedProfit, a.Assets[i].UnrealizedProfit, "UnrealizedProfit")
r.Equal(e.Assets[i].WalletBalance, a.Assets[i].WalletBalance, "WalletBalance")
r.Equal(e.Assets[i].CrossWalletBalance, a.Assets[i].CrossWalletBalance, "CrossWalletBalance")
r.Equal(e.Assets[i].CrossUnPnl, a.Assets[i].CrossUnPnl, "CrossUnPnl")
r.Equal(e.Assets[i].AvailableBalance, a.Assets[i].AvailableBalance, "AvailableBalance")
r.Equal(e.Assets[i].MarginAvailable, a.Assets[i].MarginAvailable, "MarginAvailable")
r.Equal(e.Assets[i].UpdateTime, a.Assets[i].UpdateTime, "UpdateTime")
}

r.Len(a.Positions, len(e.Positions))
Expand All @@ -209,8 +227,8 @@ func (s *accountServiceTestSuite) assertAccountEqual(e, a *Account) {
r.Equal(e.Positions[i].MaxNotional, a.Positions[i].MaxNotional, "MaxNotional")
r.Equal(e.Positions[i].PositionSide, a.Positions[i].PositionSide, "PositionSide")
r.Equal(e.Positions[i].PositionAmt, a.Positions[i].PositionAmt, "PositionAmt")
r.Equal(e.Positions[i].Notional, a.Positions[i].Notional, "Notional")
r.Equal(e.Positions[i].IsolatedWallet, a.Positions[i].IsolatedWallet, "IsolatedWallet")
r.Equal(e.Positions[i].BidNotional, a.Positions[i].BidNotional, "BidNotional")
r.Equal(e.Positions[i].AskNotional, a.Positions[i].AskNotional, "AskNotional")
r.Equal(e.Positions[i].UpdateTime, a.Positions[i].UpdateTime, "UpdateTime")
}
}

0 comments on commit e728846

Please sign in to comment.