Merge pull request #2396 from c9s/dboy/max/update-v3

FIX: [max] update withdrawal handling to use v3 API

Author: dboyliao

pkg/exchange/max/convert.go

@@ -341,24 +341,24 @@ func convertWebSocketOrderUpdate(u max.OrderUpdate) (*types.Order, error) {
 	}, nil
 }
 
-func convertWithdrawStatusV3(status max.WithdrawStatus) types.WithdrawStatus {
-	switch status {
+func convertWithdrawStatusV3(state v3.WithdrawState) types.WithdrawStatus {
+	switch state {
 
-	case max.WithdrawStatusPending:
+	case v3.WithdrawStateProcessing:
 		return types.WithdrawStatusSent
 
-	case max.WithdrawStatusOK:
+	case v3.WithdrawStateDone:
 		return types.WithdrawStatusCompleted
 
-	case max.WithdrawStatusFailed:
+	case v3.WithdrawStateFailed:
 		return types.WithdrawStatusFailed
 
-	case max.WithdrawStatusCancelled:
+	case v3.WithdrawStateCanceled:
 		return types.WithdrawStatusCancelled
 
 	}
 
-	return types.WithdrawStatus(status)
+	return types.WithdrawStatus(state)
 }
 
 func convertWithdrawStatusV2(state max.WithdrawState) types.WithdrawStatus {

pkg/exchange/max/exchange.go

@@ -530,15 +530,15 @@ func (e *Exchange) Withdraw(
 ) error {
 	asset = toLocalCurrency(asset)
 
-	addresses, err := e.client.WithdrawalService.NewGetWithdrawalAddressesRequest().
+	addresses, err := e.v3client.NewGetWithdrawalAddressesRequest().
 		Currency(asset).
 		Do(ctx)
 
 	if err != nil {
 		return err
 	}
 
-	var whitelistAddress maxapi.WithdrawalAddress
+	var whitelistAddress v3.WithdrawalAddress
 	for _, a := range addresses {
 		if a.Address == address {
 			whitelistAddress = a
@@ -554,7 +554,7 @@ func (e *Exchange) Withdraw(
 		return errors.New("address UUID can not be empty")
 	}
 
-	response, err := e.client.WithdrawalService.NewWithdrawalRequest().
+	response, err := e.v3client.NewWithdrawalRequest().
 		Currency(asset).
 		Amount(amount.Float64()).
 		AddressUUID(whitelistAddress.UUID).
@@ -892,7 +892,7 @@ func (e *Exchange) QueryWithdrawHistory(
 		}
 
 		log.Infof("querying withdraw %s: %s <=> %s", asset, startTime, endTime)
-		req := e.client.NewGetWithdrawalHistoryRequest()
+		req := e.v3client.NewGetWithdrawalHistoryRequest()
 		if len(asset) > 0 {
 			req.Currency(toLocalCurrency(asset))
 		}
@@ -917,7 +917,7 @@ func (e *Exchange) QueryWithdrawHistory(
 				continue
 			}
 
-			status := convertWithdrawStatusV2(d.State)
+			status := convertWithdrawStatusV3(d.State)
 
 			txIDs[d.TxID] = struct{}{}
 			withdraw := types.Withdraw{