rename eth to evm where appropriate

wormhole-foundation · Dec 9, 2024 · b6be4ff · b6be4ff
1 parent 0e9656d
commit b6be4ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/node/cmd/transfer-verifier/transfer-verifier-evm.go b/node/cmd/transfer-verifier/transfer-verifier-evm.go
@@ -79,16 +79,16 @@ func runTransferVerifierEvm(cmd *cobra.Command, args []string) {
 	ctx, ctxCancel := context.WithCancel(context.Background())
 	defer ctxCancel()
 
-	var ethConnector connectors.Connector
-	ethConnector, connectErr := connectors.NewEthereumBaseConnector(ctx, "eth", *evmRpc, common.HexToAddress(*evmCoreContract), logger)
+	var evmConnector connectors.Connector
+	evmConnector, connectErr := connectors.NewEthereumBaseConnector(ctx, "eth", *evmRpc, common.HexToAddress(*evmCoreContract), logger)
 	if connectErr != nil {
-		logger.Fatal("could not create new ethereum base connector",
+		logger.Fatal("could not create new evm base connector",
 			zap.Error(connectErr))
 	}
 
 	// Create main configuration for Transfer Verification
 	transferVerifier, err := txverifier.NewTransferVerifier(
-		ethConnector,
+		evmConnector,
 		&txverifier.TVAddresses{
 			CoreBridgeAddr:  common.HexToAddress(*evmCoreContract),
 			TokenBridgeAddr: common.HexToAddress(*evmTokenBridgeContract),
@@ -106,7 +106,7 @@ func runTransferVerifierEvm(cmd *cobra.Command, args []string) {
 	// Set-up for main processing loop
 
 	// Subscription for LogMessagePublished events
-	sub := txverifier.NewSubscription(ethConnector.Client(), ethConnector)
+	sub := txverifier.NewSubscription(evmConnector.Client(), evmConnector)
 	sub.Subscribe(ctx)
 	defer sub.Close()
 

diff --git a/node/pkg/transfer-verifier/transfer-verifier-evm-structs.go b/node/pkg/transfer-verifier/transfer-verifier-evm-structs.go
@@ -86,7 +86,7 @@ type TransferVerifier[E evmClient, C connector] struct {
 	// Wormhole connector for wrapping contract-specific interactions
 	logger zap.Logger
 	// Corresponds to the connector interface for EVM chains
-	ethConnector C
+	evmConnector C
 	// Corresponds to an ethClient from go-ethereum
 	client E
 	// Mapping to track the transactions that have been processed. Indexed by a log's txHash.
@@ -124,7 +124,7 @@ func NewTransferVerifier(connector connectors.Connector, tvAddrs *TVAddresses, p
 	return &TransferVerifier[*ethClient.Client, connectors.Connector]{
 		Addresses:             tvAddrs,
 		logger:                *logger,
-		ethConnector:          connector,
+		evmConnector:          connector,
 		client:                connector.Client(),
 		processedTransactions: make(map[common.Hash]*types.Receipt),
 		lastBlockNumber:       0,
@@ -736,14 +736,14 @@ func (tv *TransferVerifier[ethClient, Connector]) isWrappedAsset(
 	copy(calldata, TOKEN_BRIDGE_IS_WRAPPED_ASSET_SIGNATURE)
 	copy(calldata[4:], common.LeftPadBytes(addr.Bytes(), EVM_WORD_LENGTH))
 
-	ethCallMsg := ethereum.CallMsg{
+	evmCallMsg := ethereum.CallMsg{
 		To:   &tv.Addresses.TokenBridgeAddr,
 		Data: calldata,
 	}
 
 	tv.logger.Debug("calling isWrappedAsset()", zap.String("tokenAddress", addr.String()))
 
-	result, err := tv.client.CallContract(ctx, ethCallMsg, nil)
+	result, err := tv.client.CallContract(ctx, evmCallMsg, nil)
 
 	if err != nil {
 		// TODO add more info here
@@ -936,12 +936,12 @@ func (tv *TransferVerifier[evmClient, connector]) getDecimals(
 
 	// If the decimals aren't cached, perform an eth_call lookup for the decimals
 	// This RPC call should only be made once per token, until the guardian is restarted
-	ethCallMsg := ethereum.CallMsg{
+	evmCallMsg := ethereum.CallMsg{
 		To:   &tokenAddress,
 		Data: ERC20_DECIMALS_SIGNATURE,
 	}
 
-	result, err := tv.client.CallContract(ctx, ethCallMsg, nil)
+	result, err := tv.client.CallContract(ctx, evmCallMsg, nil)
 	if err != nil {
 		tv.logger.Warn("error from getDecimals() for token",
 			zap.String("tokenAddress", tokenAddress.String()),

diff --git a/node/pkg/transfer-verifier/transfer-verifier-evm.go b/node/pkg/transfer-verifier/transfer-verifier-evm.go
@@ -65,7 +65,7 @@ func (tv *TransferVerifier[ethClient, Connector]) ProcessEvent(ctx context.Conte
 	}
 
 	// Get the full transaction receipt for this log.
-	receipt, txReceiptErr := tv.ethConnector.TransactionReceipt(ctx, vLog.Raw.TxHash)
+	receipt, txReceiptErr := tv.evmConnector.TransactionReceipt(ctx, vLog.Raw.TxHash)
 	if txReceiptErr != nil {
 		tv.logger.Warn("could not find core bridge receipt", zap.Error(txReceiptErr))
 		return true
@@ -311,7 +311,7 @@ func (tv *TransferVerifier[evmClient, connector]) ParseReceipt(
 				continue
 			}
 
-			logMessagePublished, parseLogErr := tv.ethConnector.ParseLogMessagePublished(*log)
+			logMessagePublished, parseLogErr := tv.evmConnector.ParseLogMessagePublished(*log)
 			if parseLogErr != nil {
 				tv.logger.Error("failed to parse LogMessagePublished event")
 				receiptErr = errors.Join(receiptErr, parseLogErr)

diff --git a/node/pkg/transfer-verifier/transfer-verifier-evm_test.go b/node/pkg/transfer-verifier/transfer-verifier-evm_test.go
@@ -79,7 +79,7 @@ func setup() *mockConnections {
 			TokenBridgeAddr:   tokenBridgeAddr,
 			WrappedNativeAddr: nativeAddr,
 		},
-		ethConnector: &mockConnector{},
+		evmConnector: &mockConnector{},
 		client:       &mockClient{},
 		logger:       *logger,
 	}