Update MarginAccount

(cherry picked from commit 434b9e4)

Author: taobig

v2/margin_service.go

@@ -562,14 +562,19 @@ func (s *GetMarginAccountService) Do(ctx context.Context, opts ...RequestOption)
 
 // MarginAccount define margin account info
 type MarginAccount struct {
-	BorrowEnabled       bool        `json:"borrowEnabled"`
-	MarginLevel         string      `json:"marginLevel"`
-	TotalAssetOfBTC     string      `json:"totalAssetOfBtc"`
-	TotalLiabilityOfBTC string      `json:"totalLiabilityOfBtc"`
-	TotalNetAssetOfBTC  string      `json:"totalNetAssetOfBtc"`
-	TradeEnabled        bool        `json:"tradeEnabled"`
-	TransferEnabled     bool        `json:"transferEnabled"`
-	UserAssets          []UserAsset `json:"userAssets"`
+	Created                    bool        `json:"created"`
+	BorrowEnabled              bool        `json:"borrowEnabled"`
+	MarginLevel                string      `json:"marginLevel"`
+	CollateralMarginLevel      string      `json:"collateralMarginLevel"`
+	TotalAssetOfBTC            string      `json:"totalAssetOfBtc"`
+	TotalLiabilityOfBTC        string      `json:"totalLiabilityOfBtc"`
+	TotalNetAssetOfBTC         string      `json:"totalNetAssetOfBtc"`
+	TotalCollateralValueInUSDT string      `json:"totalCollateralValueInUSDT"`
+	TradeEnabled               bool        `json:"tradeEnabled"`
+	TransferInEnabled          bool        `json:"transferInEnabled"`
+	TransferOutEnabled         bool        `json:"transferOutEnabled"`
+	AccountType                string      `json:"accountType"`
+	UserAssets                 []UserAsset `json:"userAssets"`
 }
 
 // UserAsset define user assets of margin account

v2/margin_service_test.go

@@ -293,13 +293,18 @@ func (s *marginTestSuite) assertMarginRepayEqual(e, a *MarginRepay) {
 
 func (s *marginTestSuite) TestGetMarginAccount() {
 	data := []byte(`{
+		"created": true,
 		"borrowEnabled": true,
 		"marginLevel": "11.64405625",
+		"collateralMarginLevel": "0.64405625",
 		"totalAssetOfBtc": "6.82728457",
 		"totalLiabilityOfBtc": "0.58633215",
 		"totalNetAssetOfBtc": "6.24095242",
+		"totalCollateralValueInUSDT": "1234.33",
 		"tradeEnabled": true,
-		"transferEnabled": true,
+		"transferInEnabled": true,
+		"transferOutEnabled": true,
+		"accountType": "MARGIN_1",
 		"userAssets": [
 			{
 				"asset": "BTC",
@@ -344,13 +349,18 @@ func (s *marginTestSuite) TestGetMarginAccount() {
 	res, err := s.client.NewGetMarginAccountService().Do(newContext())
 	s.r().NoError(err)
 	e := &MarginAccount{
-		BorrowEnabled:       true,
-		MarginLevel:         "11.64405625",
-		TotalAssetOfBTC:     "6.82728457",
-		TotalLiabilityOfBTC: "0.58633215",
-		TotalNetAssetOfBTC:  "6.24095242",
-		TradeEnabled:        true,
-		TransferEnabled:     true,
+		Created:                    true,
+		BorrowEnabled:              true,
+		MarginLevel:                "11.64405625",
+		CollateralMarginLevel:      "0.64405625",
+		TotalAssetOfBTC:            "6.82728457",
+		TotalLiabilityOfBTC:        "0.58633215",
+		TotalNetAssetOfBTC:         "6.24095242",
+		TotalCollateralValueInUSDT: "1234.33",
+		TradeEnabled:               true,
+		TransferInEnabled:          true,
+		TransferOutEnabled:         true,
+		AccountType:                "MARGIN_1",
 		UserAssets: []UserAsset{
 			{
 				Asset:    "BTC",
@@ -491,13 +501,18 @@ func (s *marginTestSuite) assertIsolatedMarginAssetEqual(e, a IsolatedMarginAsse
 
 func (s *marginTestSuite) assertMarginAccountEqual(e, a *MarginAccount) {
 	r := s.r()
+	r.Equal(e.Created, a.Created, "Created")
 	r.Equal(e.BorrowEnabled, a.BorrowEnabled, "BorrowEnabled")
 	r.Equal(e.MarginLevel, a.MarginLevel, "MarginLevel")
+	r.Equal(e.CollateralMarginLevel, a.CollateralMarginLevel, "CollateralMarginLevel")
 	r.Equal(e.TotalAssetOfBTC, a.TotalAssetOfBTC, "TotalAssetOfBTC")
 	r.Equal(e.TotalLiabilityOfBTC, a.TotalLiabilityOfBTC, "TotalLiabilityOfBTC")
 	r.Equal(e.TotalNetAssetOfBTC, a.TotalNetAssetOfBTC, "TotalNetAssetOfBTC")
+	r.Equal(e.TotalCollateralValueInUSDT, a.TotalCollateralValueInUSDT, "TotalCollateralValueInUSDT")
 	r.Equal(e.TradeEnabled, a.TradeEnabled, "TradeEnabled")
-	r.Equal(e.TransferEnabled, a.TransferEnabled, "TransferEnabled")
+	r.Equal(e.TransferInEnabled, a.TransferInEnabled, "TransferInEnabled")
+	r.Equal(e.TransferOutEnabled, a.TransferOutEnabled, "TransferOutEnabled")
+	r.Equal(e.AccountType, a.AccountType, "AccountType")
 	r.Len(a.UserAssets, len(e.UserAssets), "UserAssets")
 	for i := 0; i < len(a.UserAssets); i++ {
 		s.assertUserAssetEqual(e.UserAssets[i], a.UserAssets[i])