refactor: rename dstChain to chain (#595)

Co-authored-by: fx0x55 <80245546+fx0x55@users.noreply.github.com>
FunctionX · Jul 24, 2024 · 156326f · 156326f
1 parent a4bb1b5
commit 156326f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/contract/ICrossChain.go b/contract/ICrossChain.go
diff --git a/solidity/contracts/bridge/ICrossChain.sol b/solidity/contracts/bridge/ICrossChain.sol
@@ -47,7 +47,7 @@ interface ICrossChain is IFIP20CrossChain, IBridgeCall {
     ) external view returns (uint256 _amount);
 
     function executeClaim(
-        string memory _dstChainId,
+        string memory _chain,
         uint256 _eventNonce
     ) external returns (bool _result);
 
@@ -107,6 +107,6 @@ interface ICrossChain is IFIP20CrossChain, IBridgeCall {
     event ExecuteClaimEvent(
         address indexed _sender,
         uint256 _eventNonce,
-        string _dstChain
+        string _chain
     );
 }
diff --git a/tests/contract/CrossChainTest.go b/tests/contract/CrossChainTest.go
diff --git a/tests/crosschain_suite.go b/tests/crosschain_suite.go
@@ -702,7 +702,7 @@ func (suite *CrosschainTestSuite) ExecuteClaim() *ethtypes.Transaction {
 	suite.Require().True(len(externalClaims) > 0)
 
 	pack, err := precompile.NewExecuteClaimMethod(nil).PackInput(crosschaintypes.ExecuteClaimArgs{
-		DstChain:   suite.chainName,
+		Chain:      suite.chainName,
 		EventNonce: new(big.Int).SetUint64(externalClaims[0].GetEventNonce()),
 	})
 	suite.Require().NoError(err)

diff --git a/x/crosschain/precompile/execute_claim.go b/x/crosschain/precompile/execute_claim.go
@@ -52,7 +52,7 @@ func (m *ExecuteClaimMethod) Run(evm *vm.EVM, contract *vm.Contract) ([]byte, er
 		return nil, err
 	}
 
-	crosschainKeeper, has := m.router.GetRoute(args.DstChain)
+	crosschainKeeper, has := m.router.GetRoute(args.Chain)
 	if !has {
 		return nil, errors.New("chain not support")
 	}
@@ -61,7 +61,7 @@ func (m *ExecuteClaimMethod) Run(evm *vm.EVM, contract *vm.Contract) ([]byte, er
 		if err = crosschainKeeper.ExecuteClaim(ctx, args.EventNonce.Uint64()); err != nil {
 			return err
 		}
-		data, topic, err := m.NewExecuteClaimEvent(contract.Caller(), args.EventNonce, args.DstChain)
+		data, topic, err := m.NewExecuteClaimEvent(contract.Caller(), args.EventNonce, args.Chain)
 		if err != nil {
 			return err
 		}
@@ -85,7 +85,7 @@ func (m *ExecuteClaimMethod) NewExecuteClaimEvent(sender common.Address, eventNo
 }
 
 func (m *ExecuteClaimMethod) PackInput(args crosschaintypes.ExecuteClaimArgs) ([]byte, error) {
-	arguments, err := m.Method.Inputs.Pack(args.DstChain, args.EventNonce)
+	arguments, err := m.Method.Inputs.Pack(args.Chain, args.EventNonce)
 	if err != nil {
 		return nil, err
 	}

diff --git a/x/crosschain/precompile/execute_claim_test.go b/x/crosschain/precompile/execute_claim_test.go
@@ -15,17 +15,17 @@ import (
 func TestExecuteClaimMethod_ABI(t *testing.T) {
 	executeClaim := precompile.NewExecuteClaimMethod(nil)
 
-	methodStr := `function executeClaim(string _dstChainId, uint256 _eventNonce) returns(bool _result)`
+	methodStr := `function executeClaim(string _chain, uint256 _eventNonce) returns(bool _result)`
 	assert.Equal(t, methodStr, executeClaim.Method.String())
 
-	eventStr := `event ExecuteClaimEvent(address indexed _sender, uint256 _eventNonce, string _dstChain)`
+	eventStr := `event ExecuteClaimEvent(address indexed _sender, uint256 _eventNonce, string _chain)`
 	assert.Equal(t, eventStr, executeClaim.Event.String())
 }
 
 func TestExecuteClaimMethod_PackInput(t *testing.T) {
 	executeClaim := precompile.NewExecuteClaimMethod(nil)
 	input, err := executeClaim.PackInput(types.ExecuteClaimArgs{
-		DstChain:   ethtypes.ModuleName,
+		Chain:      ethtypes.ModuleName,
 		EventNonce: big.NewInt(1),
 	})
 	assert.NoError(t, err)

diff --git a/x/crosschain/types/contract.go b/x/crosschain/types/contract.go
@@ -185,12 +185,12 @@ func (args *AddPendingPoolRewardArgs) Validate() error {
 }
 
 type ExecuteClaimArgs struct {
-	DstChain   string   `abi:"_dstChainId"`
+	Chain      string   `abi:"_chain"`
 	EventNonce *big.Int `abi:"_eventNonce"`
 }
 
 func (args *ExecuteClaimArgs) Validate() error {
-	if err := ValidateModuleName(args.DstChain); err != nil {
+	if err := ValidateModuleName(args.Chain); err != nil {
 		return err
 	}
 	if args.EventNonce == nil || args.EventNonce.Sign() <= 0 {