From 9fca0b9d7210cfb0bc30524c334240860cc13403 Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Fri, 1 Dec 2023 08:55:26 -0500 Subject: [PATCH 1/3] Empty commit --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 95e4ee5a..ce017c9b 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -8,6 +8,7 @@ on: branches: - '*' + jobs: golangci: runs-on: ubuntu-20.04 From 98bf582981508d1f61fc65688fd49948fa797436 Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Fri, 1 Dec 2023 08:56:45 -0500 Subject: [PATCH 2/3] Fix linter running on every commit --- .github/workflows/linter.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ce017c9b..3839ef2d 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -6,9 +6,8 @@ name: Run Golang Linter on: push: branches: - - '*' + - "*" - jobs: golangci: runs-on: ubuntu-20.04 From 3d9e5e5d381c035e32733fd2c8938cee74d06f1a Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Fri, 1 Dec 2023 09:18:15 -0500 Subject: [PATCH 3/3] Linter now runs on every commit --- .github/workflows/codeql.yml | 2 +- .github/workflows/e2e.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/test.yml | 2 +- messages/teleporter/message_manager_test.go | 8 ++++---- peers/external_handler.go | 10 +++++----- tests/basic_relay.go | 2 +- vms/evm/subscriber.go | 14 +++++++------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index eba994ea..72ffa8d6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,7 +16,7 @@ on: pull_request: branches: - - '*' + - "**" jobs: analyze: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4c273c2f..d6af7b64 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - main pull_request: branches: - - "*" + - "**" env: GO_VERSION: "1.20.10" diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 3839ef2d..dbaca95a 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -6,7 +6,7 @@ name: Run Golang Linter on: push: branches: - - "*" + - "**" jobs: golangci: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ddaa30aa..9a08bc81 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ name: Tests on: push: branches: - - "*" + - "**" env: GO_VERSION: "1.20.10" diff --git a/messages/teleporter/message_manager_test.go b/messages/teleporter/message_manager_test.go index a36356d4..07e5f6dc 100644 --- a/messages/teleporter/message_manager_test.go +++ b/messages/teleporter/message_manager_test.go @@ -100,7 +100,7 @@ func TestShouldSendMessage(t *testing.T) { expectedResult bool }{ { - name: "valid message", + name: "valid message", destinationBlockchainID: destinationBlockchainID, warpMessageInfo: &vmtypes.WarpMessageInfo{ WarpUnsignedMessage: warpUnsignedMessage, @@ -115,7 +115,7 @@ func TestShouldSendMessage(t *testing.T) { expectedResult: true, }, { - name: "invalid message", + name: "invalid message", destinationBlockchainID: destinationBlockchainID, warpMessageInfo: &vmtypes.WarpMessageInfo{ WarpUnsignedMessage: warpUnsignedMessage2, @@ -133,7 +133,7 @@ func TestShouldSendMessage(t *testing.T) { expectedError: true, }, { - name: "not allowed", + name: "not allowed", destinationBlockchainID: destinationBlockchainID, warpMessageInfo: &vmtypes.WarpMessageInfo{ WarpUnsignedMessage: warpUnsignedMessage, @@ -144,7 +144,7 @@ func TestShouldSendMessage(t *testing.T) { expectedResult: false, }, { - name: "message already delivered", + name: "message already delivered", destinationBlockchainID: destinationBlockchainID, warpMessageInfo: &vmtypes.WarpMessageInfo{ WarpUnsignedMessage: warpUnsignedMessage, diff --git a/peers/external_handler.go b/peers/external_handler.go index 728d3f11..f67c23a9 100644 --- a/peers/external_handler.go +++ b/peers/external_handler.go @@ -108,11 +108,11 @@ func (h *RelayerExternalHandler) HandleInbound(_ context.Context, inboundMessage } reqID := ids.RequestID{ - NodeID: inboundMessage.NodeID(), - SourceChainID: sourceBlockchainID, - DestinationChainID: blockchainID, - RequestID: requestID, - Op: byte(inboundMessage.Op()), + NodeID: inboundMessage.NodeID(), + SourceChainID: sourceBlockchainID, + DestinationChainID: blockchainID, + RequestID: requestID, + Op: byte(inboundMessage.Op()), } h.RegisterResponse(reqID) diff --git a/tests/basic_relay.go b/tests/basic_relay.go index c84eee56..6cc52892 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -156,7 +156,7 @@ func BasicRelay() { input := teleportermessenger.TeleporterMessageInput{ DestinationBlockchainID: teleporterMessage.DestinationBlockchainID, - DestinationAddress: teleporterMessage.DestinationAddress, + DestinationAddress: teleporterMessage.DestinationAddress, FeeInfo: teleportermessenger.TeleporterFeeInfo{ FeeTokenAddress: fundedAddress, Amount: big.NewInt(0), diff --git a/vms/evm/subscriber.go b/vms/evm/subscriber.go index bc8d581c..c28503a3 100644 --- a/vms/evm/subscriber.go +++ b/vms/evm/subscriber.go @@ -80,13 +80,13 @@ func NewSubscriber(logger logging.Logger, subnetInfo config.SourceSubnet, db dat logs := make(chan vmtypes.WarpLogInfo, maxClientSubscriptionBuffer) return &subscriber{ - nodeWSURL: subnetInfo.GetNodeWSEndpoint(), - nodeRPCURL: subnetInfo.GetNodeRPCEndpoint(), - blockchainID: blockchainID, - logger: logger, - db: db, - logsChan: logs, - dial: ethclient.Dial, + nodeWSURL: subnetInfo.GetNodeWSEndpoint(), + nodeRPCURL: subnetInfo.GetNodeRPCEndpoint(), + blockchainID: blockchainID, + logger: logger, + db: db, + logsChan: logs, + dial: ethclient.Dial, } }