Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"compile": "forge build",
"deploy": "bash setupInfraContracts.sh"
},
"pre-commit": [],
"author": "",
"license": "ISC",
"devDependencies": {
Expand Down
9 changes: 2 additions & 7 deletions test/DeliveryHelper.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,11 @@ contract DeliveryHelperTest is SetupTest {
watcherPrecompile.setAppGateways(gateways, signatureNonce++, watcherSignature);
}

function _executeReadBatchSingleChain(
uint32 chainSlug_,
uint256 totalPayloads
) internal returns (bytes32 asyncId) {
function _executeReadBatchSingleChain() internal returns (bytes32 asyncId) {
asyncId = getNextAsyncId();
}

function _executeReadBatchMultiChain(
uint32[] memory chainSlugs_
) internal returns (bytes32 asyncId) {
function _executeReadBatchMultiChain() internal returns (bytes32 asyncId) {
asyncId = getNextAsyncId();
}

Expand Down
10 changes: 5 additions & 5 deletions test/Storage.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ contract StorageTest is DeliveryHelperTest {
setUpDeliveryHelper();
}

function testAddressResolverSlot() public {
function testAddressResolverSlot() public view {
// Test AddressResolver version at slot 59
bytes32 versionSlot = vm.load(address(addressResolver), bytes32(uint256(59)));
assertEq(uint64(uint256(versionSlot)), 1);
}

function testWatcherPrecompileSlot() public {
function testWatcherPrecompileSlot() public view {
// Test AddressResolver address at slot 109 in WatcherPrecompile
bytes32 slotValue = vm.load(address(watcherPrecompile), bytes32(uint256(52)));
assertEq(uint256(slotValue), evmxSlug);
Expand All @@ -25,15 +25,15 @@ contract StorageTest is DeliveryHelperTest {
assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
}

function testFeesManagerSlot() public {
function testFeesManagerSlot() public view {
bytes32 slotValue = vm.load(address(feesManager), bytes32(uint256(51)));
assertEq(uint32(uint256(slotValue)), evmxSlug);

slotValue = vm.load(address(feesManager), bytes32(uint256(106)));
assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
}

function testAuctionManagerSlot() public {
function testAuctionManagerSlot() public view {
bytes32 slotValue = vm.load(address(auctionManager), bytes32(uint256(50)));
assertEq(uint32(uint256(slotValue)), evmxSlug);

Expand Down Expand Up @@ -65,7 +65,7 @@ contract StorageTest is DeliveryHelperTest {
assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
}

function testDeliveryHelperSlot() public {
function testDeliveryHelperSlot() public view {
bytes32 slotValue = vm.load(address(deliveryHelper), bytes32(uint256(50)));
assertEq(uint256(uint256(slotValue)), 0);

Expand Down
2 changes: 1 addition & 1 deletion test/apps/SuperTokenLockable.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ contract SuperTokenLockableTest is DeliveryHelperTest {
vm.expectEmit(true, true, false, true);
emit BatchCancelled(bridgeAsyncId);
finalizeQuery(payloadIds[1], abi.encode(0.001 ether));
bytes32 cancelAsyncId = getNextAsyncId();

bytes32[] memory cancelPayloadIds = new bytes32[](1);
uint32 srcChainSlug = IForwarder(userOrder.srcToken).getChainSlug();
Expand All @@ -334,6 +333,7 @@ contract SuperTokenLockableTest is DeliveryHelperTest {
payloadIdCounter++
);

// bytes32 cancelAsyncId = getNextAsyncId();
// bidAndEndAuction(cancelAsyncId);
// finalizeAndExecute(
// cancelPayloadIds[0],
Expand Down
Loading