add check

bnb-chain · May 19, 2022 · 2a61389 · 2a61389
1 parent 9458d61
commit 2a61389
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/plugins/dex/order/fee_test.go b/plugins/dex/order/fee_test.go
@@ -303,14 +303,22 @@ func TestFeeManager_calcTradeFeeForSingleTransfer_SupportBUSD(t *testing.T) {
 	// enough BNB, BNB will be collected
 	_, acc := testutils.NewAccount(ctx, am, 1e5)
 
-	// transferred in BUSD-BD1
+	// transferred in BNB
 	tran := Transfer{
+		inAsset: "BNB",
+		in:      2e3,
+	}
+	fee := keeper.FeeManager.calcTradeFeeFromTransfer(acc.GetCoins(), &tran, keeper.engines)
+	require.Equal(t, sdk.Coins{{"BNB", 1}}, fee.Tokens)
+
+	// transferred in BUSD-BD1
+	tran = Transfer{
 		inAsset:  "BUSD-BD1",
 		in:       1e3,
 		outAsset: "ABC-000",
 		out:      1e4,
 	}
-	fee := keeper.FeeManager.calcTradeFeeFromTransfer(acc.GetCoins(), &tran, keeper.engines)
+	fee = keeper.FeeManager.calcTradeFeeFromTransfer(acc.GetCoins(), &tran, keeper.engines)
 	require.Equal(t, sdk.Coins{{"BNB", 5e2}}, fee.Tokens)
 
 	// transferred in ABC-000

diff --git a/plugins/dex/order/keeper.go b/plugins/dex/order/keeper.go
@@ -1107,7 +1107,7 @@ func (kp *Keeper) CanListTradingPair(ctx sdk.Context, baseAsset, quoteAsset stri
 		quoteAsset != types.NativeTokenSymbol {
 
 		// support busd pair listing
-		if sdk.IsUpgrade(upgrade.BEP70) {
+		if sdk.IsUpgrade(upgrade.BEP70) && len(BUSDSymbol) > 0 {
 			if baseAsset == BUSDSymbol || quoteAsset == BUSDSymbol {
 				if kp.pairExistsBetween(ctx, types.NativeTokenSymbol, BUSDSymbol) {
 					return nil