diff --git a/tests/basic_relay.go b/tests/basic_relay.go index aac8f414..cee885a5 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -20,6 +20,7 @@ import ( testUtils "github.com/ava-labs/awm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/core/types" predicateutils "github.com/ava-labs/subnet-evm/predicate" + subnetevmutils "github.com/ava-labs/subnet-evm/utils" "github.com/ava-labs/subnet-evm/x/warp" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/Teleporter/TeleporterMessenger" teleporterTestUtils "github.com/ava-labs/teleporter/tests/utils" @@ -209,7 +210,7 @@ func BasicRelay() { // Check the transaction storage key has warp message we're expecting storageKeyHashes := accessLists[0].StorageKeys - packedPredicate := testUtils.HashSliceToBytes(storageKeyHashes) + packedPredicate := subnetevmutils.HashSliceToBytes(storageKeyHashes) predicateBytes, err := predicateutils.UnpackPredicate(packedPredicate) Expect(err).Should(BeNil()) receivedWarpMessage, err = avalancheWarp.ParseMessage(predicateBytes) diff --git a/tests/utils/utils.go b/tests/utils/utils.go index 4164e29e..598ba545 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -9,7 +9,6 @@ import ( "os" "os/exec" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" ) @@ -56,12 +55,3 @@ func ReadHexTextFile(filename string) string { Expect(err).Should(BeNil()) return string(fileData) } - -// HashSliceToBytes serializes a []common.Hash into a tightly packed byte array. -func HashSliceToBytes(hashes []common.Hash) []byte { - bytes := make([]byte, common.HashLength*len(hashes)) - for i, hash := range hashes { - copy(bytes[i*common.HashLength:], hash[:]) - } - return bytes -}