Fix darwinia-bridge provider tests error

perrornet · perrornet · commit b4e73a7ee395 · 2024-07-09T15:46:16.000+08:00
diff --git a/utils/constant/chain.go b/utils/constant/chain.go
@@ -39,6 +39,7 @@ const (
 	ChainNameKeyInCtx    ContextKey = "chain_name"
 	LogKeyInCtx          ContextKey = "log"
 	NoticeFieldsKeyInCtx ContextKey = "notice_fields"
+	FeeTestKeyInCtx      ContextKey = "fee_test"
 )
 
 var (
diff --git a/utils/provider/bridge/darwinia/crab2darwinia.go b/utils/provider/bridge/darwinia/crab2darwinia.go
@@ -95,6 +95,9 @@ func Crab2Darwinia(ctx context.Context, args SwapParams) (tx *types.LegacyTx, er
 	if err != nil {
 		return nil, errors.Wrap(err, "fetchMsglineFeeAndParams")
 	}
+	if ctx.Value(constant.FeeTestKeyInCtx) != nil { // for test
+		fee = ctx.Value(constant.FeeTestKeyInCtx).(decimal.Decimal)
+	}
 	if isNativeToken {
 		data, err = WTokenLockAndXIssue(conf.targetChainId,
 			wallet.GetAddress(true), wallet.GetAddress(true), args.Amount, args.Nonce, "", common.Bytes2Hex(param))
diff --git a/utils/provider/bridge/darwinia/crab2darwinia_test.go b/utils/provider/bridge/darwinia/crab2darwinia_test.go
@@ -1,19 +1,23 @@
 package darwinia
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/shopspring/decimal"
-	"github.com/stretchr/testify/assert"
+	"context"
 	"omni-balance/utils"
 	"omni-balance/utils/chains"
+	"omni-balance/utils/constant"
 	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/shopspring/decimal"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCrab2Darwinia(t *testing.T) {
 	var (
 		args   = InitVar(t)
 		amount = decimal.NewFromBigInt(chains.EthToWei(decimal.RequireFromString("0")), 0)
 	)
+	args.ctx = context.WithValue(args.ctx, constant.FeeTestKeyInCtx, decimal.RequireFromString("1"))
 	tx, err := Crab2Darwinia(args.ctx, SwapParams{
 		Sender:    args.sender,
 		TokenName: "CRAB",
diff --git a/utils/provider/bridge/darwinia/darwinia2crab.go b/utils/provider/bridge/darwinia/darwinia2crab.go
@@ -89,6 +89,9 @@ func Darwinia2Crab(ctx context.Context, args SwapParams) (tx *types.LegacyTx, er
 	if err != nil {
 		return nil, errors.Wrap(err, "fetchMsglineFeeAndParams")
 	}
+	if ctx.Value(constant.FeeTestKeyInCtx) != nil { // for test
+		fee = ctx.Value(constant.FeeTestKeyInCtx).(decimal.Decimal)
+	}
 	if isNativeToken {
 		data, err = WTokenLockAndXIssue(tokenConf.targetChainId, realWallet, realWallet, args.Amount,
 			args.Nonce, "", common.Bytes2Hex(param))
diff --git a/utils/provider/bridge/darwinia/darwinia2ethereum.go b/utils/provider/bridge/darwinia/darwinia2ethereum.go
@@ -82,6 +82,10 @@ func Darwinia2ethereum(ctx context.Context, args SwapParams) (tx *types.LegacyTx
 		return nil, errors.Wrap(err, "fetchMsglineFeeAndParams")
 	}
 
+	if ctx.Value(constant.FeeTestKeyInCtx) != nil { // for test
+		fee = ctx.Value(constant.FeeTestKeyInCtx).(decimal.Decimal)
+	}
+
 	if isNativeToken {
 		data, err = WTokenLockAndXIssue(tokenConf.targetChainId, tokenConf.recipient, realWallet,
 			args.Amount, args.Nonce, common.Bytes2Hex(extData), common.Bytes2Hex(param))
diff --git a/utils/provider/bridge/darwinia/darwinia2ethereum_test.go b/utils/provider/bridge/darwinia/darwinia2ethereum_test.go
@@ -1,19 +1,23 @@
 package darwinia
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/shopspring/decimal"
-	"github.com/stretchr/testify/assert"
+	"context"
 	"omni-balance/utils"
 	"omni-balance/utils/chains"
+	"omni-balance/utils/constant"
 	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/shopspring/decimal"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDarwinia2ethereum(t *testing.T) {
 	var (
 		args   = InitVar(t)
 		amount = decimal.NewFromBigInt(chains.EthToWei(decimal.RequireFromString("0")), 0)
 	)
+	args.ctx = context.WithValue(args.ctx, constant.FeeTestKeyInCtx, decimal.RequireFromString("1"))
 	tx, err := Darwinia2ethereum(args.ctx, SwapParams{
 		Sender:    args.sender,
 		TokenName: "RING",
@@ -22,7 +26,7 @@ func TestDarwinia2ethereum(t *testing.T) {
 		Client:    args.client,
 	})
 	assert.NoError(t, err)
-	utils.AssertEqualFold(t, common.Bytes2Hex(tx.Data), "7104AAD500000000000000000000000000000000000000000000000000000000000000010000000000000000000000004CA75992D2750BEC270731A72DFDEDE6B9E71CC700000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018FC32B2D7900000000000000000000000000000000000000000000000000000000000000E000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000080000000000000000000000000C29DCB1F12A1618262EF9FBA673B77140ADC02D60000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001443EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000016FE400000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000")
+	utils.AssertEqualFold(t, common.Bytes2Hex(tx.Data), "7104AAD500000000000000000000000000000000000000000000000000000000000000010000000000000000000000004CA75992D2750BEC270731A72DFDEDE6B9E71CC700000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018FC32B2D7900000000000000000000000000000000000000000000000000000000000000E000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000080000000000000000000000000C29DCB1F12A1618262EF9FBA673B77140ADC02D60000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001443EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000014CDE00000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000")
 	assert.Equal(t, tx.To.Hex(), "0x092e19C46C9daAb7824393f1CD9c22f5BEA13560")
 
 	tx, err = Darwinia2ethereum(args.ctx, SwapParams{
@@ -33,6 +37,6 @@ func TestDarwinia2ethereum(t *testing.T) {
 		Client:    args.client,
 	})
 	assert.NoError(t, err)
-	utils.AssertEqualFold(t, common.Bytes2Hex(tx.Data), "ac66b6a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000004020000000000000000000000004ca75992d2750bec270731a72dfdede6b9e71cc700000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fc32ddb4f00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000006000000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000016c0400000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000")
+	utils.AssertEqualFold(t, common.Bytes2Hex(tx.Data), "AC66B6A2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000004020000000000000000000000004CA75992D2750BEC270731A72DFDEDE6B9E71CC700000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018FC32DDB4F00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000006000000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000148FD00000000000000000000000043EF13E84D9992D1461A1F90CAC4653658CEA4FD00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000")
 	assert.Equal(t, tx.To.Hex(), "0x2B496f19A420C02490dB859fefeCCD71eDc2c046")
 }
diff --git a/utils/provider/bridge/darwinia/ethereum2darwinia.go b/utils/provider/bridge/darwinia/ethereum2darwinia.go
@@ -89,6 +89,9 @@ func Ethereum2darwinia(ctx context.Context, args SwapParams) (tx *types.LegacyTx
 	if err != nil {
 		return nil, errors.Wrap(err, "FetchMsglineFeeAndParams")
 	}
+	if ctx.Value(constant.FeeTestKeyInCtx) != nil { // for test
+		fee = ctx.Value(constant.FeeTestKeyInCtx).(decimal.Decimal)
+	}
 
 	if strings.EqualFold(tokenConf.contractAddress.Hex(), constant.ZeroAddress.Hex()) {
 		contractAddress = tokenConf.remoteAppAddress
diff --git a/utils/provider/bridge/darwinia/ethereum2darwinia_test.go b/utils/provider/bridge/darwinia/ethereum2darwinia_test.go
@@ -37,6 +37,7 @@ func TestEthereum2darwinia(t *testing.T) {
 		conf   = InitVar(t)
 		amount = decimal.NewFromBigInt(chains.EthToWei(decimal.RequireFromString("0")), 0)
 	)
+	conf.ctx = context.WithValue(conf.ctx, constant.FeeTestKeyInCtx, decimal.RequireFromString("1"))
 
 	type args struct {
 		ctx  context.Context
@@ -61,7 +62,8 @@ func TestEthereum2darwinia(t *testing.T) {
 					Client:    conf.client,
 				},
 			},
-			wantData: "cf5a8bd80000000000000000000000004ca75992d2750bec270731a72dfdede6b9e71cc700000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fc30e1b2100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000092e19c46c9daab7824393f1cd9c22f5bea135600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001443ef13e84d9992d1461a1f90cac4653658cea4fd000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000579cc00000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+
+			wantData: "cf5a8bd80000000000000000000000004ca75992d2750bec270731a72dfdede6b9e71cc700000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fc30e1b2100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000092e19c46c9daab7824393f1cd9c22f5bea135600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001443ef13e84d9992d1461a1f90cac4653658cea4fd000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000546f800000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
 			wantTo:   "0xc29dCb1F12a1618262eF9FBA673b77140adc02D6",
 			wantErr:  nil,
 		},
@@ -77,7 +79,7 @@ func TestEthereum2darwinia(t *testing.T) {
 					Client:    conf.client,
 				},
 			},
-			wantData: "57bf09850000000000000000000000009f284e1337a815fe77d2ff4ae46544645b20c5ff0000000000000000000000004ca75992d2750bec270731a72dfdede6b9e71cc700000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fc31aa7e200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000006000000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000051fcc00000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+			wantData: "57bf09850000000000000000000000009f284e1337a815fe77d2ff4ae46544645b20c5ff0000000000000000000000004ca75992d2750bec270731a72dfdede6b9e71cc700000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018fc31aa7e200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000006000000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000545a200000000000000000000000043ef13e84d9992d1461a1f90cac4653658cea4fd00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
 			wantTo:   "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1",
 			wantErr:  nil,
 		},

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ const (`
`39`	`39`	`ChainNameKeyInCtx ContextKey = "chain_name"`
`40`	`40`	`LogKeyInCtx ContextKey = "log"`
`41`	`41`	`NoticeFieldsKeyInCtx ContextKey = "notice_fields"`
	`42`	`+ FeeTestKeyInCtx ContextKey = "fee_test"`
`42`	`43`	`)`
`43`	`44`
`44`	`45`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ func Ethereum2darwinia(ctx context.Context, args SwapParams) (tx *types.LegacyTx`
`89`	`89`	`if err != nil {`
`90`	`90`	`return nil, errors.Wrap(err, "FetchMsglineFeeAndParams")`
`91`	`91`	`}`
	`92`	`+ if ctx.Value(constant.FeeTestKeyInCtx) != nil { // for test`
	`93`	`+ fee = ctx.Value(constant.FeeTestKeyInCtx).(decimal.Decimal)`
	`94`	`+ }`
`92`	`95`
`93`	`96`	`if strings.EqualFold(tokenConf.contractAddress.Hex(), constant.ZeroAddress.Hex()) {`
`94`	`97`	`contractAddress = tokenConf.remoteAppAddress`