Skip to content

Commit d177be8

Browse files
committed
fmt
1 parent b224b74 commit d177be8

2 files changed

Lines changed: 21 additions & 36 deletions

File tree

script/DeployReceiver.s.sol

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ contract DeployReceiver is Script {
1616
// -----------------------------------------------------------------------------------------
1717
// Load environment variables
1818
//
19-
address messageSender = vm.envOr(
20-
"MESSAGE_SENDER",
21-
0xf5F4496219F31CDCBa6130B5402873624585615a
22-
);
19+
address messageSender = vm.envOr("MESSAGE_SENDER", 0xf5F4496219F31CDCBa6130B5402873624585615a);
2320
address wormholeCore = vm.envAddress("WORMHOLE_CORE");
2421
uint16 wormholeChainId = uint16(vm.envUint("WORMHOLE_CHAIN_ID"));
2522

@@ -30,32 +27,18 @@ contract DeployReceiver is Script {
3027
//
3128
vm.startBroadcast();
3229
UniswapWormholeMessageReceiver receiver = new UniswapWormholeMessageReceiver({
33-
wormholeAddress: wormholeCore,
34-
_messageSender: wormholeMessageSender,
35-
_chainId: wormholeChainId
36-
});
30+
wormholeAddress: wormholeCore, _messageSender: wormholeMessageSender, _chainId: wormholeChainId
31+
});
3732
vm.stopBroadcast();
3833

3934
// -----------------------------------------------------------------------------------------
4035
// Smoke check the deployment.
4136
//
42-
require(
43-
receiver.messageSender() == wormholeMessageSender,
44-
"mismatch: messageSender"
45-
);
37+
require(receiver.messageSender() == wormholeMessageSender, "mismatch: messageSender");
4638
require(receiver.chainId() == wormholeChainId, "mismatch: chainId");
47-
require(
48-
receiver.ETHEREUM_CHAIN_ID() == WORMHOLE_ETHEREUM_CHAIN_ID,
49-
"mismatch: ETHEREUM_CHAIN_ID"
50-
);
51-
require(
52-
receiver.nextMinimumSequence() == 0,
53-
"mismatch: nextMinimumSequence"
54-
);
55-
require(
56-
receiver.MESSAGE_TIME_OUT_SECONDS() == 2 days,
57-
"mismatch: MESSAGE_TIME_OUT_SECONDS"
58-
);
39+
require(receiver.ETHEREUM_CHAIN_ID() == WORMHOLE_ETHEREUM_CHAIN_ID, "mismatch: ETHEREUM_CHAIN_ID");
40+
require(receiver.nextMinimumSequence() == 0, "mismatch: nextMinimumSequence");
41+
require(receiver.MESSAGE_TIME_OUT_SECONDS() == 2 days, "mismatch: MESSAGE_TIME_OUT_SECONDS");
5942

6043
// -----------------------------------------------------------------------------------------
6144
// Log the output.

test/UniswapWormholeMessageSenderReceiver.t.sol

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ contract UniswapWormholeMessageSenderReceiverTest is Test {
4848
wormhole = IWormhole(setupWormhole());
4949

5050
// set up uniswap wormhole message receiver contract
51-
address uniReceiverAddress = address(new UniswapWormholeMessageReceiver(address(wormhole), msgSender, bsc_chain_id));
51+
address uniReceiverAddress =
52+
address(new UniswapWormholeMessageReceiver(address(wormhole), msgSender, bsc_chain_id));
5253
uniReceiver = IUniswapWormholeMessageReceiver(uniReceiverAddress);
5354

5455
// deploy the mock governance contract
@@ -82,14 +83,15 @@ contract UniswapWormholeMessageSenderReceiverTest is Test {
8283

8384
// These values are the default values used in our tilt test environment
8485
// and are not important.
85-
Setup(address(wormholeAddress)).setup(
86-
address(wormholeImpl),
87-
initSigners,
88-
bsc_chain_id, // BSC chain ID
89-
1, // Governance source chain ID (1 = solana)
90-
0x0000000000000000000000000000000000000000000000000000000000000004, // Governance source address
91-
block.chainid // evm chain Id
92-
);
86+
Setup(address(wormholeAddress))
87+
.setup(
88+
address(wormholeImpl),
89+
initSigners,
90+
bsc_chain_id, // BSC chain ID
91+
1, // Governance source chain ID (1 = solana)
92+
0x0000000000000000000000000000000000000000000000000000000000000004, // Governance source address
93+
block.chainid // evm chain Id
94+
);
9395
return address(wormholeAddress);
9496
}
9597

@@ -193,7 +195,7 @@ contract UniswapWormholeMessageSenderReceiverTest is Test {
193195
wormhole = IWormhole(setupWormhole());
194196

195197
// set up uniswap wormhole message receiver contract, with Ethereum as the destination chain ID
196-
vm.expectRevert('Invalid chainId Ethereum');
198+
vm.expectRevert("Invalid chainId Ethereum");
197199
address(new UniswapWormholeMessageReceiver(address(wormhole), msgSender, ethereum_chain_id));
198200
}
199201

@@ -226,7 +228,7 @@ contract UniswapWormholeMessageSenderReceiverTest is Test {
226228
// update the wormhole message fee
227229
updateWormholeMessageFee(newFee);
228230

229-
vm.expectRevert('invalid receiverChainID Ethereum');
231+
vm.expectRevert("invalid receiverChainID Ethereum");
230232
uniSender.sendMessage{value: newFee}(targets, values, datas, address(uniReceiver), ethereum_chain_id);
231233
}
232234

@@ -237,7 +239,7 @@ contract UniswapWormholeMessageSenderReceiverTest is Test {
237239
// update the wormhole message fee
238240
updateWormholeMessageFee(newFee);
239241

240-
vm.expectRevert('invalid receiverChainID Unset');
242+
vm.expectRevert("invalid receiverChainID Unset");
241243
uniSender.sendMessage{value: newFee}(targets, values, datas, address(uniReceiver), unset_chain_id);
242244
}
243245

0 commit comments

Comments
 (0)