Add MarginBorrowRepayService (#662)

Author: taobig

v2/client.go

@@ -131,6 +131,8 @@ var (
 // SelfTradePreventionMode define self trade prevention strategy
 type SelfTradePreventionMode string
 
+type MarginAccountBorrowRepayType string
+
 // UseTestnet switch all the API endpoints from production to the testnet
 var UseTestnet = false
 
@@ -321,6 +323,9 @@ const (
 	SelfTradePreventionModeExpireTaker SelfTradePreventionMode = "EXPIRE_TAKER"
 	SelfTradePreventionModeExpireBoth  SelfTradePreventionMode = "EXPIRE_BOTH"
 	SelfTradePreventionModeExpireMaker SelfTradePreventionMode = "EXPIRE_MAKER"
+
+	MarginAccountBorrow MarginAccountBorrowRepayType = "BORROW"
+	MarginAccountRepay  MarginAccountBorrowRepayType = "REPAY"
 )
 
 func currentTimestamp() int64 {
@@ -771,15 +776,22 @@ func (c *Client) NewMarginTransferService() *MarginTransferService {
 }
 
 // NewMarginLoanService init margin account loan service
+// Deprecated: use NewMarginBorrowRepayService instead
 func (c *Client) NewMarginLoanService() *MarginLoanService {
 	return &MarginLoanService{c: c}
 }
 
 // NewMarginRepayService init margin account repay service
+// Deprecated: use NewMarginBorrowRepayService instead
 func (c *Client) NewMarginRepayService() *MarginRepayService {
 	return &MarginRepayService{c: c}
 }
 
+// NewMarginBorrowRepayService init margin account borrow/repay service
+func (c *Client) NewMarginBorrowRepayService() *MarginBorrowRepayService {
+	return &MarginBorrowRepayService{c: c}
+}
+
 // NewCreateMarginOrderService init creating margin order service
 func (c *Client) NewCreateMarginOrderService() *CreateMarginOrderService {
 	return &CreateMarginOrderService{c: c}

v2/margin_service.go

@@ -64,6 +64,7 @@ type TransactionResponse struct {
 }
 
 // MarginLoanService apply for a loan
+// Deprecated: use MarginBorrowRepayService instead
 type MarginLoanService struct {
 	c          *Client
 	asset      string
@@ -128,6 +129,7 @@ func (s *MarginLoanService) Do(ctx context.Context, opts ...RequestOption) (res
 }
 
 // MarginRepayService repay loan for margin account
+// Deprecated: use MarginBorrowRepayService instead
 type MarginRepayService struct {
 	c          *Client
 	asset      string
@@ -191,6 +193,77 @@ func (s *MarginRepayService) Do(ctx context.Context, opts ...RequestOption) (res
 	return res, nil
 }
 
+// MarginBorrowRepayService borrow/repay for margin account
+type MarginBorrowRepayService struct {
+	c          *Client
+	asset      string                       // Mandatory:YES
+	amount     string                       // Mandatory:YES
+	isIsolated bool                         // Mandatory:YES, TRUE for Isolated Margin, FALSE for Cross Margin, Default FALSE
+	symbol     string                       // Mandatory:YES, Only for Isolated margin
+	_type      MarginAccountBorrowRepayType // Mandatory:YES, BORROW or REPAY
+}
+
+// Asset set asset being transferred, e.g., BTC
+func (s *MarginBorrowRepayService) Asset(asset string) *MarginBorrowRepayService {
+	s.asset = asset
+	return s
+}
+
+// Amount the amount to be transferred
+func (s *MarginBorrowRepayService) Amount(amount string) *MarginBorrowRepayService {
+	s.amount = amount
+	return s
+}
+
+// IsIsolated is for isolated margin or not, "TRUE", "FALSE"，default "FALSE"
+func (s *MarginBorrowRepayService) IsIsolated(isIsolated bool) *MarginBorrowRepayService {
+	s.isIsolated = isIsolated
+	return s
+}
+
+// Symbol set isolated symbol
+func (s *MarginBorrowRepayService) Symbol(symbol string) *MarginBorrowRepayService {
+	s.symbol = symbol
+	return s
+}
+
+func (s *MarginBorrowRepayService) Type(marginBorrowRepayType MarginAccountBorrowRepayType) *MarginBorrowRepayService {
+	s._type = marginBorrowRepayType
+	return s
+}
+
+// Do send request
+func (s *MarginBorrowRepayService) Do(ctx context.Context, opts ...RequestOption) (res *TransactionResponse, err error) {
+	r := &request{
+		method:   http.MethodPost,
+		endpoint: "/sapi/v1/margin/borrow-repay",
+		secType:  secTypeSigned,
+	}
+	m := params{
+		"asset":  s.asset,
+		"amount": s.amount,
+		"type":   string(s._type),
+	}
+	r.setFormParams(m)
+	if s.isIsolated {
+		r.setParam("isIsolated", "TRUE")
+	}
+	if s.symbol != "" {
+		r.setParam("symbol", s.symbol)
+	}
+
+	res = new(TransactionResponse)
+	data, err := s.c.callAPI(ctx, r, opts...)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(data, res)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
 // ListMarginLoansService list loan record
 type ListMarginLoansService struct {
 	c         *Client

v2/margin_service_test.go

@@ -92,6 +92,64 @@ func (s *marginTestSuite) TestRepay() {
 	s.assertTransactionResponseEqual(e, res)
 }
 
+func (s *marginTestSuite) TestBorrowRepayBorrow() {
+	data := []byte(`{
+		"tranId": 100000001
+	}`)
+	s.mockDo(data, nil)
+	defer s.assertDo()
+	asset := "BTC"
+	amount := "1.000"
+	_type := MarginAccountBorrow
+	s.assertReq(func(r *request) {
+		e := newSignedRequest().setFormParams(params{
+			"asset":  asset,
+			"amount": amount,
+			"type":   string(_type),
+		})
+		s.assertRequestEqual(e, r)
+	})
+	res, err := s.client.NewMarginBorrowRepayService().
+		Asset(asset).
+		Amount(amount).
+		Type(_type).
+		Do(newContext())
+	s.r().NoError(err)
+	e := &TransactionResponse{
+		TranID: 100000001,
+	}
+	s.assertTransactionResponseEqual(e, res)
+}
+
+func (s *marginTestSuite) TestBorrowRepayRepay() {
+	data := []byte(`{
+		"tranId": 100000001
+	}`)
+	s.mockDo(data, nil)
+	defer s.assertDo()
+	asset := "BTC"
+	amount := "1.000"
+	_type := MarginAccountRepay
+	s.assertReq(func(r *request) {
+		e := newSignedRequest().setFormParams(params{
+			"asset":  asset,
+			"amount": amount,
+			"type":   string(_type),
+		})
+		s.assertRequestEqual(e, r)
+	})
+	res, err := s.client.NewMarginBorrowRepayService().
+		Asset(asset).
+		Amount(amount).
+		Type(_type).
+		Do(newContext())
+	s.r().NoError(err)
+	e := &TransactionResponse{
+		TranID: 100000001,
+	}
+	s.assertTransactionResponseEqual(e, res)
+}
+
 func (s *marginTestSuite) TestListMarginLoans() {
 	data := []byte(`{
 		"rows": [