From 10ed00abb5395fec6a4f4f257d09befe1dbf53fd Mon Sep 17 00:00:00 2001 From: cam-schultz Date: Fri, 12 Jan 2024 21:45:56 +0000 Subject: [PATCH] resolve merge conflict --- tests/basic_relay.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/basic_relay.go b/tests/basic_relay.go index 0fc3e25f..2052852f 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -272,15 +272,15 @@ func BasicRelay(network interfaces.LocalNetwork) { log.Info("Waiting for a new block confirmation on subnet B") <-newHeadsB delivered1, err := subnetBInfo.TeleporterMessenger.MessageReceived( - &bind.CallOpts{}, subnetAInfo.BlockchainID, id1, + &bind.CallOpts{}, id1, ) Expect(err).Should(BeNil()) delivered2, err := subnetBInfo.TeleporterMessenger.MessageReceived( - &bind.CallOpts{}, subnetAInfo.BlockchainID, id2, + &bind.CallOpts{}, id2, ) Expect(err).Should(BeNil()) delivered3, err := subnetBInfo.TeleporterMessenger.MessageReceived( - &bind.CallOpts{}, subnetAInfo.BlockchainID, id3, + &bind.CallOpts{}, id3, ) Expect(err).Should(BeNil()) Expect(delivered1).Should(BeFalse()) @@ -298,7 +298,7 @@ func sendBasicTeleporterMessage( destination interfaces.SubnetTestInfo, fundedKey *ecdsa.PrivateKey, fundedAddress common.Address, -) (teleportermessenger.TeleporterMessage, *big.Int) { +) (teleportermessenger.TeleporterMessage, ids.ID) { log.Info("Packing Teleporter message") teleporterMessage := teleportermessenger.TeleporterMessage{ MessageNonce: big.NewInt(1),