Simplification in relay provider deploy script.

ethereum/contracts/coreRelayer/CoreRelayerSetters.sol

@@ -27,8 +27,8 @@ contract CoreRelayerSetters is CoreRelayerState, Context {
         _state.provider.governanceContract = governanceContract;
     }
 
-    function setChainId(uint16 chainId_) internal {
-        _state.provider.chainId = chainId_;
+    function setChainId(uint16 chainId) internal {
+        _state.provider.chainId = chainId;
     }
 
     function setWormhole(address wh) internal {

ethereum/ts-scripts/coreRelayer/deployCoreRelayer.ts

@@ -25,20 +25,20 @@ async function run() {
     coreRelayerProxies: [],
   }
 
-  for (let i = 0; i < chains.length; i++) {
-    console.log(`Deploying for chain ${chains[i].chainId}...`)
-    const coreRelayerLibrary = await deployCoreRelayerLibrary(chains[i])
+  for (const chain of chains) {
+    console.log(`Deploying for chain ${chain.chainId}...`)
+    const coreRelayerLibrary = await deployCoreRelayerLibrary(chain)
     const coreRelayerImplementation = await deployCoreRelayerImplementation(
-      chains[i],
+      chain,
       coreRelayerLibrary.address
     )
-    const coreRelayerSetup = await deployCoreRelayerSetup(chains[i])
+    const coreRelayerSetup = await deployCoreRelayerSetup(chain)
     const coreRelayerProxy = await deployCoreRelayerProxy(
-      chains[i],
+      chain,
       coreRelayerSetup.address,
       coreRelayerImplementation.address,
-      chains[i].wormholeAddress,
-      getRelayProviderAddress(chains[i])
+      chain.wormholeAddress,
+      getRelayProviderAddress(chain)
     )
 
     output.coreRelayerLibraries.push(coreRelayerLibrary)

ethereum/ts-scripts/coreRelayer/registerChainsCoreRelayerSelfSign.ts

@@ -26,9 +26,6 @@ async function registerChainsCoreRelayer(chain: ChainInfo) {
   console.log("registerChainsCoreRelayer " + chain.chainId)
 
   const coreRelayer = getCoreRelayer(chain)
-  await coreRelayer
-    .setDefaultRelayProvider(createDefaultRelayProviderVAA(chain))
-    .then(wait)
   for (let i = 0; i < chains.length; i++) {
     await coreRelayer
       .registerCoreRelayerContract(createRegisterChainVAA(chains[i]))

ethereum/ts-scripts/relayProvider/deployRelayProvider.ts

@@ -24,12 +24,12 @@ async function run() {
     relayProviderProxies: [],
   }
 
-  for (let i = 0; i < chains.length; i++) {
-    console.log(`Deploying for chain ${chains[i].chainId}...`)
-    const relayProviderImplementation = await deployRelayProviderImplementation(chains[i])
-    const relayProviderSetup = await deployRelayProviderSetup(chains[i])
+  for (const chain of chains) {
+    console.log(`Deploying for chain ${chain.chainId}...`)
+    const relayProviderImplementation = await deployRelayProviderImplementation(chain)
+    const relayProviderSetup = await deployRelayProviderSetup(chain)
     const relayProviderProxy = await deployRelayProviderProxy(
-      chains[i],
+      chain,
       relayProviderSetup.address,
       relayProviderImplementation.address
     )