feat: fix test

Signed-off-by: Pablo Maldonado <[email protected]>
across-protocol · Nov 8, 2024 · a34ec72 · a34ec72
1 parent d973250
commit a34ec72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/contracts/chain-adapters/Solana_Adapter.sol b/contracts/chain-adapters/Solana_Adapter.sol
@@ -93,10 +93,10 @@ contract Solana_Adapter is AdapterInterface, CircleCCTPAdapter {
         cctpMessageTransmitter = _cctpMessageTransmitter;
 
         SOLANA_SPOKE_POOL_BYTES32 = solanaSpokePool;
-        SOLANA_SPOKE_POOL_ADDRESS = solanaSpokePool.toAddress();
+        SOLANA_SPOKE_POOL_ADDRESS = solanaSpokePool.toAddressUnchecked();
 
         SOLANA_USDC_BYTES32 = solanaUsdc;
-        SOLANA_USDC_ADDRESS = solanaUsdc.toAddress();
+        SOLANA_USDC_ADDRESS = solanaUsdc.toAddressUnchecked();
 
         SOLANA_SPOKE_POOL_USDC_VAULT = solanaSpokePoolUsdcVault;
     }

diff --git a/contracts/libraries/AddressConverters.sol b/contracts/libraries/AddressConverters.sol
@@ -13,6 +13,10 @@ library Bytes32ToAddress {
         }
         return address(uint160(uint256(_bytes32)));
     }
+
+    function toAddressUnchecked(bytes32 _bytes32) internal pure returns (address) {
+        return address(uint160(uint256(_bytes32)));
+    }
 }
 
 library AddressToBytes32 {

diff --git a/test/evm/hardhat/chain-adapters/Solana_Adapter.ts b/test/evm/hardhat/chain-adapters/Solana_Adapter.ts
@@ -87,7 +87,7 @@ describe("Solana Chain Adapter", function () {
     const functionCallData = mockSpoke.interface.encodeFunctionData("setCrossDomainAdmin", [newAdmin]);
     expect(await hubPool.relaySpokePoolAdminFunction(solanaChainId, functionCallData))
       .to.emit(solanaAdapter.attach(hubPool.address), "MessageRelayed")
-      .withArgs(solanaSpokePoolAddress, functionCallData);
+      .withArgs(solanaSpokePoolAddress.toLowerCase(), functionCallData);
     expect(cctpMessageTransmitter.sendMessage).to.have.been.calledWith(
       solanaDomainId,
       solanaSpokePoolBytes32,