Merge pull request #230 from ava-labs/consistent-var-names

Consistent variable names
ava-labs · Jan 12, 2024 · bedf79b · bedf79b
2 parents 144c3c0 + f6a7b08
commit bedf79b
Show file tree

Hide file tree

Showing 55 changed files with 479 additions and 474 deletions.
diff --git a/abi-bindings/go/CrossChainApplications/examples/ERC20Bridge/ERC20Bridge/ERC20Bridge.go b/abi-bindings/go/CrossChainApplications/examples/ERC20Bridge/ERC20Bridge/ERC20Bridge.go
diff --git a/...ations/examples/ExampleMessenger/ExampleCrossChainMessenger/ExampleCrossChainMessenger.go b/...ations/examples/ExampleMessenger/ExampleCrossChainMessenger/ExampleCrossChainMessenger.go
diff --git a/...go/CrossChainApplications/examples/NativeTokenBridge/ERC20TokenSource/ERC20TokenSource.go b/...go/CrossChainApplications/examples/NativeTokenBridge/ERC20TokenSource/ERC20TokenSource.go
diff --git a/...nApplications/examples/NativeTokenBridge/NativeTokenDestination/NativeTokenDestination.go b/...nApplications/examples/NativeTokenBridge/NativeTokenDestination/NativeTokenDestination.go
diff --git a/.../CrossChainApplications/examples/NativeTokenBridge/NativeTokenSource/NativeTokenSource.go b/.../CrossChainApplications/examples/NativeTokenBridge/NativeTokenSource/NativeTokenSource.go
diff --git a/...rossChainApplications/examples/VerifiedBlockHash/BlockHashPublisher/BlockHashPublisher.go b/...rossChainApplications/examples/VerifiedBlockHash/BlockHashPublisher/BlockHashPublisher.go
diff --git a/.../CrossChainApplications/examples/VerifiedBlockHash/BlockHashReceiver/BlockHashReceiver.go b/.../CrossChainApplications/examples/VerifiedBlockHash/BlockHashReceiver/BlockHashReceiver.go
diff --git a/abi-bindings/go/Teleporter/TeleporterMessenger/TeleporterMessenger.go b/abi-bindings/go/Teleporter/TeleporterMessenger/TeleporterMessenger.go
diff --git a/abi-bindings/go/Teleporter/TeleporterMessenger/event_test.go b/abi-bindings/go/Teleporter/TeleporterMessenger/event_test.go
@@ -111,7 +111,7 @@ func TestFilterTeleporterEvents(t *testing.T) {
 				},
 				expected: &TeleporterMessengerReceiveCrossChainMessage{
 					MessageID:          mockMessageID,
-					OriginBlockchainID: mockBlockchainID,
+					SourceBlockchainID: mockBlockchainID,
 					Deliverer:          deliverer,
 					RewardRedeemer:     deliverer,
 					Message:            message,
@@ -125,7 +125,7 @@ func TestFilterTeleporterEvents(t *testing.T) {
 				},
 				expected: &TeleporterMessengerMessageExecuted{
 					MessageID:          mockMessageID,
-					OriginBlockchainID: mockBlockchainID,
+					SourceBlockchainID: mockBlockchainID,
 				},
 			},
 		}

diff --git a/abi-bindings/go/Teleporter/TeleporterMessenger/packing.go b/abi-bindings/go/Teleporter/TeleporterMessenger/packing.go
@@ -19,7 +19,7 @@ func init() {
 	var err error
 	teleporterMessageType, err = abi.NewType("tuple", "struct Overloader.F", []abi.ArgumentMarshaling{
 		{Name: "messageNonce", Type: "uint256"},
-		{Name: "senderAddress", Type: "address"},
+		{Name: "originSenderAddress", Type: "address"},
 		{Name: "destinationBlockchainID", Type: "bytes32"},
 		{Name: "destinationAddress", Type: "address"},
 		{Name: "requiredGasLimit", Type: "uint256"},
@@ -76,13 +76,13 @@ func PackSendCrossChainMessage(input TeleporterMessageInput) ([]byte, error) {
 	return abi.Pack("sendCrossChainMessage", input)
 }
 
-func PackRetryMessageExecution(originChainID ids.ID, message TeleporterMessage) ([]byte, error) {
+func PackRetryMessageExecution(sourceBlockchainID ids.ID, message TeleporterMessage) ([]byte, error) {
 	abi, err := TeleporterMessengerMetaData.GetAbi()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get abi")
 	}
 
-	return abi.Pack("retryMessageExecution", originChainID, message)
+	return abi.Pack("retryMessageExecution", sourceBlockchainID, message)
 }
 
 // PackReceiveCrossChainMessage packs a ReceiveCrossChainMessageInput to form a call to the receiveCrossChainMessage function

diff --git a/abi-bindings/go/Teleporter/TeleporterMessenger/packing_test.go b/abi-bindings/go/Teleporter/TeleporterMessenger/packing_test.go
@@ -16,7 +16,7 @@ import (
 func createTestTeleporterMessage(messageNonce *big.Int) TeleporterMessage {
 	m := TeleporterMessage{
 		MessageNonce:            messageNonce,
-		SenderAddress:           common.HexToAddress("0x0123456789abcdef0123456789abcdef01234567"),
+		OriginSenderAddress:     common.HexToAddress("0x0123456789abcdef0123456789abcdef01234567"),
 		DestinationBlockchainID: ids.ID{1, 2, 3, 4},
 		DestinationAddress:      common.HexToAddress("0x0123456789abcdef0123456789abcdef01234567"),
 		RequiredGasLimit:        big.NewInt(2),
@@ -109,7 +109,7 @@ func TestUnpackEvent(t *testing.T) {
 				},
 				out: new(TeleporterMessengerReceiveCrossChainMessage),
 				expected: &TeleporterMessengerReceiveCrossChainMessage{
-					OriginBlockchainID: mockBlockchainID,
+					SourceBlockchainID: mockBlockchainID,
 					MessageID:          mockMessageID,
 					Deliverer:          deliverer,
 					RewardRedeemer:     deliverer,
@@ -125,7 +125,7 @@ func TestUnpackEvent(t *testing.T) {
 				out: new(TeleporterMessengerMessageExecuted),
 				expected: &TeleporterMessengerMessageExecuted{
 					MessageID:          mockMessageID,
-					OriginBlockchainID: mockBlockchainID,
+					SourceBlockchainID: mockBlockchainID,
 				},
 			},
 		}