add openwallet.Error

Author: zhiquan911

openwtester/transcation_assets_test.go

@@ -126,7 +126,7 @@ func TestTransfer_TRX(t *testing.T) {
 
 	testGetAssetsAccountBalance(tm, walletID, accountID)
 
-	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "0.3", "", nil)
+	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "0.03", "", nil)
 	if err != nil {
 		return
 	}
@@ -157,29 +157,29 @@ func TestTransfer_TRC20(t *testing.T) {
 	accountID := "4pF3jRC2XokaaLZWiiLvxXrD8SKRYNuzcVCFkJdu6rkt"
 	to := "TRJJ9Mq4aMjdmKWpTDJAgbYNoY2P9Facg5"
 
-	//contract := openwallet.SmartContract{
-	//	Address:  "THvZvKPLHKLJhEFYKiyqj6j8G8nGgfg7ur",
-	//	Symbol:   "TRX",
-	//	Name:     "TRONdice",
-	//	Token:    "DICE",
-	//	Decimals: 6,
-	//	Protocol: "trc20",
-	//}
-
 	contract := openwallet.SmartContract{
-		Address:  "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
+		Address:  "THvZvKPLHKLJhEFYKiyqj6j8G8nGgfg7ur",
 		Symbol:   "TRX",
-		Name:     "Tether USD",
-		Token:    "USDT",
+		Name:     "TRONdice",
+		Token:    "DICE",
 		Decimals: 6,
 		Protocol: "trc20",
 	}
 
+	//contract := openwallet.SmartContract{
+	//	Address:  "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
+	//	Symbol:   "TRX",
+	//	Name:     "Tether USD",
+	//	Token:    "USDT",
+	//	Decimals: 6,
+	//	Protocol: "trc20",
+	//}
+
 	testGetAssetsAccountBalance(tm, walletID, accountID)
 
 	testGetAssetsAccountTokenBalance(tm, walletID, accountID, contract)
 
-	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "1.5", "", &contract)
+	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "9.5", "", &contract)
 	if err != nil {
 		return
 	}

tron/tx_decode.go

@@ -100,7 +100,7 @@ func (decoder *TransactionDecoder) CreateSimpleTransaction(wrapper openwallet.Wa
 	}
 
 	if len(addresses) == 0 {
-		return fmt.Errorf("[%s] have not addresses", accountID)
+		return openwallet.Errorf(openwallet.ErrAccountNotAddress,"[%s] have not addresses", accountID)
 	}
 
 	searchAddrs := make([]string, 0)
@@ -163,7 +163,7 @@ func (decoder *TransactionDecoder) CreateSimpleTransaction(wrapper openwallet.Wa
 	}
 
 	if findAddrBalance == nil {
-		return fmt.Errorf("the balance: %s is not enough", amountStr)
+		return openwallet.Errorf(openwallet.ErrInsufficientBalanceOfAccount, "the balance: %s is not enough", amountStr)
 	}
 
 	//最后创建交易单
@@ -231,6 +231,10 @@ func (decoder *TransactionDecoder) CreateTokenTransaction(wrapper openwallet.Wal
 		}
 	})
 
+	tokenBalanceNotEnough := false
+	balanceNotEnough := false
+	errStr := ""
+
 	amountDec, _ := decimal.NewFromString(amountStr)
 
 	for _, addrBalance := range addrBalanceArray {
@@ -265,6 +269,7 @@ func (decoder *TransactionDecoder) CreateTokenTransaction(wrapper openwallet.Wal
 
 		//总消耗数量 = 转账数量 + 手续费
 		if addrBalance_dec.LessThan(amountDec.Add(feeInfo.Fee)) {
+			tokenBalanceNotEnough = true
 			continue
 		}
 
@@ -273,7 +278,10 @@ func (decoder *TransactionDecoder) CreateTokenTransaction(wrapper openwallet.Wal
 			//判断账户资源是否足够
 			isEnoughEnegry, energyRest, feeMini := decoder.wm.IsEnoughEnergyToTransferTRC20(addrBalance.Balance.Address, trxBalance)
 			if !isEnoughEnegry {
-				return openwallet.Errorf(openwallet.ErrInsufficientFees, "address[%s] available energy: %d is less than feeMini: %d", addrBalance.Balance.Address, energyRest, feeMini)
+				balanceNotEnough = true
+				errStr = fmt.Sprintf("address[%s] available energy: %d is less than feeMini: %d", addrBalance.Balance.Address, energyRest, feeMini)
+				continue
+
 			}
 		}
 
@@ -287,7 +295,12 @@ func (decoder *TransactionDecoder) CreateTokenTransaction(wrapper openwallet.Wal
 	}
 
 	if findAddrBalance == nil {
-		return fmt.Errorf("the balance: %s is not enough", amountStr)
+		if tokenBalanceNotEnough {
+			return openwallet.Errorf(openwallet.ErrInsufficientTokenBalanceOfAddress,"the balance: %s is not enough", amountStr)
+		}
+		if balanceNotEnough {
+			return openwallet.Errorf(openwallet.ErrInsufficientFees, errStr)
+		}
 	}
 
 	//最后创建交易单