Skip to content

Commit 89adc9a

Browse files
rookmaterookmate
committed
chore: update tests to always transfer even if test fails
1 parent 76bd707 commit 89adc9a

6 files changed

Lines changed: 62 additions & 44 deletions

File tree

‎script/tests/deploy_tests.ts‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,35 @@ export async function executeDeployTests(
8181
// Selects two random chains out of the available ones
8282
const randomChains = selectRandomChains(chains, 1);
8383

84-
await deployOnchain(randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
84+
try {
85+
await deployOnchain(randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
8586

86-
let chainAddresses = await fetchForwarderAndOnchainAddress('noPlugNoInititialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
87-
addresses.deployForwarders!.push(chainAddresses.forwarder);
88-
addresses.deployOnchain!.push(chainAddresses.onchain);
87+
let chainAddresses = await fetchForwarderAndOnchainAddress('noPlugNoInititialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
88+
addresses.deployForwarders!.push(chainAddresses.forwarder);
89+
addresses.deployOnchain!.push(chainAddresses.onchain);
8990

90-
chainAddresses = await fetchForwarderAndOnchainAddress('noPlugInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
91-
addresses.deployForwarders!.push(chainAddresses.forwarder);
92-
addresses.deployOnchain!.push(chainAddresses.onchain);
91+
chainAddresses = await fetchForwarderAndOnchainAddress('noPlugInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
92+
addresses.deployForwarders!.push(chainAddresses.forwarder);
93+
addresses.deployOnchain!.push(chainAddresses.onchain);
9394

94-
chainAddresses = await fetchForwarderAndOnchainAddress('plugNoInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
95-
addresses.deployForwarders!.push(chainAddresses.forwarder);
96-
addresses.deployOnchain!.push(chainAddresses.onchain);
95+
chainAddresses = await fetchForwarderAndOnchainAddress('plugNoInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
96+
addresses.deployForwarders!.push(chainAddresses.forwarder);
97+
addresses.deployOnchain!.push(chainAddresses.onchain);
9798

98-
chainAddresses = await fetchForwarderAndOnchainAddress('plugInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
99-
addresses.deployForwarders!.push(chainAddresses.forwarder);
100-
addresses.deployOnchain!.push(chainAddresses.onchain);
99+
chainAddresses = await fetchForwarderAndOnchainAddress('plugInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
100+
addresses.deployForwarders!.push(chainAddresses.forwarder);
101+
addresses.deployOnchain!.push(chainAddresses.onchain);
101102

102-
chainAddresses = await fetchForwarderAndOnchainAddress('plugInitializeTwice', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
103-
addresses.deployForwarders!.push(chainAddresses.forwarder);
104-
addresses.deployOnchain!.push(chainAddresses.onchain);
103+
chainAddresses = await fetchForwarderAndOnchainAddress('plugInitializeTwice', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
104+
addresses.deployForwarders!.push(chainAddresses.forwarder);
105+
addresses.deployOnchain!.push(chainAddresses.onchain);
105106

106-
chainAddresses = await fetchForwarderAndOnchainAddress('plugNoInitInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
107-
addresses.deployForwarders!.push(chainAddresses.forwarder);
108-
addresses.deployOnchain!.push(chainAddresses.onchain);
107+
chainAddresses = await fetchForwarderAndOnchainAddress('plugNoInitInitialize', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
108+
addresses.deployForwarders!.push(chainAddresses.forwarder);
109+
addresses.deployOnchain!.push(chainAddresses.onchain);
109110

110-
await runDeployAppGatewayTests(addresses, chains.evmxChain, randomChains);
111-
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
111+
await runDeployAppGatewayTests(addresses, chains.evmxChain, randomChains);
112+
} finally {
113+
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
114+
}
112115
}

‎script/tests/insufficient_tests.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ export async function executeInsufficientFeesTests(
117117
const randomChains = selectRandomChains(chains, 1);
118118
const selectedChain = randomChains[0];
119119

120-
await deployOnchain(selectedChain.chainId, appGateway, chains.evmxChain);
121-
await runInsufficientFeesTests('multichain', selectedChain.chainId, appGateway, chains.evmxChain);
122-
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
120+
try {
121+
await deployOnchain(selectedChain.chainId, appGateway, chains.evmxChain);
122+
await runInsufficientFeesTests('multichain', selectedChain.chainId, appGateway, chains.evmxChain);
123+
} finally {
124+
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
125+
}
123126
}

‎script/tests/revert_tests.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,15 @@ export async function executeRevertTests(
119119
const randomChains = selectRandomChains(chains, 1);
120120
const selectedChain = randomChains[0];
121121

122-
await deployOnchain(selectedChain.chainId, addresses.appGateway, chains.evmxChain);
122+
try {
123+
await deployOnchain(selectedChain.chainId, addresses.appGateway, chains.evmxChain);
123124

124-
const chainAddresses = await fetchForwarderAndOnchainAddress('counter', selectedChain.chainId, addresses.appGateway, chains.evmxChain);
125-
addresses.chain2Forwarder = chainAddresses.forwarder;
126-
addresses.chain2Onchain = chainAddresses.onchain;
125+
const chainAddresses = await fetchForwarderAndOnchainAddress('counter', selectedChain.chainId, addresses.appGateway, chains.evmxChain);
126+
addresses.chain2Forwarder = chainAddresses.forwarder;
127+
addresses.chain2Onchain = chainAddresses.onchain;
127128

128-
await runRevertTests(addresses, chains.evmxChain, selectedChain.chainId);
129-
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
129+
await runRevertTests(addresses, chains.evmxChain, selectedChain.chainId);
130+
} finally {
131+
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
132+
}
130133
}

‎script/tests/scheduler_tests.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ export async function executeSchedulerTests(
8585
const appGateway = await deployAppGateway('ScheduleAppGateway', chains.evmxChain);
8686

8787
await depositFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
88-
await runSchedulerTests(appGateway, chains.evmxChain);
89-
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
88+
try {
89+
await runSchedulerTests(appGateway, chains.evmxChain);
90+
} finally {
91+
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
92+
}
9093
}

‎script/tests/trigger_tests.ts‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,20 @@ export async function executeTriggerTests(
124124
// Selects two random chains out of the available ones
125125
const randomChains = selectRandomChains(chains, 2);
126126

127-
await deployOnchain(randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
128-
await deployOnchain(randomChains[1].chainId, addresses.appGateway, chains.evmxChain);
127+
try {
128+
await deployOnchain(randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
129+
await deployOnchain(randomChains[1].chainId, addresses.appGateway, chains.evmxChain);
129130

130-
const chain1Addresses = await fetchForwarderAndOnchainAddress('onchainToEVMx', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
131-
addresses.chain1Forwarder = chain1Addresses.forwarder;
132-
addresses.chain1Onchain = chain1Addresses.onchain;
131+
const chain1Addresses = await fetchForwarderAndOnchainAddress('onchainToEVMx', randomChains[0].chainId, addresses.appGateway, chains.evmxChain);
132+
addresses.chain1Forwarder = chain1Addresses.forwarder;
133+
addresses.chain1Onchain = chain1Addresses.onchain;
133134

134-
const chain2Addresses = await fetchForwarderAndOnchainAddress('onchainToEVMx', randomChains[1].chainId, addresses.appGateway, chains.evmxChain);
135-
addresses.chain2Forwarder = chain2Addresses.forwarder;
136-
addresses.chain2Onchain = chain2Addresses.onchain;
135+
const chain2Addresses = await fetchForwarderAndOnchainAddress('onchainToEVMx', randomChains[1].chainId, addresses.appGateway, chains.evmxChain);
136+
addresses.chain2Forwarder = chain2Addresses.forwarder;
137+
addresses.chain2Onchain = chain2Addresses.onchain;
137138

138-
await runTriggerAppGatewayOnchainTests(addresses, chains.evmxChain, randomChains);
139-
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
139+
await runTriggerAppGatewayOnchainTests(addresses, chains.evmxChain, randomChains);
140+
} finally {
141+
await withdrawFunds(addresses.appGateway, chains.arbMainnetChain, chains.evmxChain);
142+
}
140143
}

‎script/tests/upload_tests.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ export async function executeUploadTests(
7070
const randomChains = selectRandomChains(chains, 1);
7171
const selectedChain = randomChains[0];
7272

73-
await runUploadTests("Counter", appGateway, chains.evmxChain, selectedChain);
74-
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
73+
try {
74+
await runUploadTests("Counter", appGateway, chains.evmxChain, selectedChain);
75+
} finally {
76+
await withdrawFunds(appGateway, chains.arbMainnetChain, chains.evmxChain);
77+
}
7578
}

0 commit comments

Comments
 (0)