Rename runAndReturn to run on VM Bridge bootstrap

Author: m-Peter

fvm/bootstrap.go

@@ -1075,7 +1075,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	txIndex := uint32(0)
 	events := flow.EventsList{}
 
-	runAndReturn := func(tx *flow.TransactionBody, failMSG string) ProcedureOutput {
+	run := func(tx *flow.TransactionBody, failMSG string) ProcedureOutput {
 		txOutput, err := b.runMetaTransaction(ctx, Transaction(tx, txIndex))
 
 		if err != nil {
@@ -1095,7 +1095,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build COA contract transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to create COA in Service Account: %s")
+	_ = run(txBody, "failed to create COA in Service Account: %s")
 
 	// Arbitrary high gas limit that can be used for all the
 	// EVM transactions to ensure none of them run out of gas
@@ -1110,7 +1110,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build EVM contract transaction: %s", err))
 	}
-	txOutput := runAndReturn(txBody, "failed to deploy the Factory in the Service Account COA: %s")
+	txOutput := run(txBody, "failed to deploy the Factory in the Service Account COA: %s")
 
 	factoryAddress, err := getContractAddressFromEVMEvent(txOutput)
 	if err != nil {
@@ -1125,7 +1125,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build Solidity Registry contract to the service account's COA transaction: %s", err))
 	}
-	txOutput = runAndReturn(txBody, "failed to deploy the Registry in the Service Account COA: %s")
+	txOutput = run(txBody, "failed to deploy the Registry in the Service Account COA: %s")
 
 	registryAddress, err := getContractAddressFromEVMEvent(txOutput)
 	if err != nil {
@@ -1140,7 +1140,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build Solidity ERC20 Deployer contract to the service account's COA transaction: %s", err))
 	}
-	txOutput = runAndReturn(txBody, "failed to deploy the ERC20 Deployer in the Service Account COA: %s")
+	txOutput = run(txBody, "failed to deploy the ERC20 Deployer in the Service Account COA: %s")
 
 	erc20DeployerAddress, err := getContractAddressFromEVMEvent(txOutput)
 	if err != nil {
@@ -1154,7 +1154,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build ERC721 deployer contract to the service account's COA transaction: %s", err))
 	}
-	txOutput = runAndReturn(txBody, "failed to deploy the ERC721 Deployer in the Service Account COA: %s")
+	txOutput = run(txBody, "failed to deploy the ERC721 Deployer in the Service Account COA: %s")
 
 	erc721DeployerAddress, err := getContractAddressFromEVMEvent(txOutput)
 	if err != nil {
@@ -1174,13 +1174,13 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 			if err != nil {
 				panic(fmt.Sprintf("failed to build FlowEVMBridgeUtils transaction: %s", err))
 			}
-			runAndReturn(txBody, "failed to deploy FlowEVMBridgeUtils contract: %s")
+			_ = run(txBody, "failed to deploy FlowEVMBridgeUtils contract: %s")
 		} else {
 			txBody, err := blueprints.DeployContractTransaction(serviceAddress, contract, name).Build()
 			if err != nil {
 				panic(fmt.Sprintf("failed to build "+name+" contract transaction: %s", err))
 			}
-			runAndReturn(txBody, "failed to deploy "+name+" contract: %s")
+			_ = run(txBody, "failed to deploy "+name+" contract: %s")
 		}
 	}
 
@@ -1189,49 +1189,49 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build pause the bridge contracts transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to pause the bridge contracts: %s")
+	_ = run(txBody, "failed to pause the bridge contracts: %s")
 
 	// Set the factory as registrar in the registry
 	txBody, err = blueprints.SetRegistrarTransaction(*env, bridgeEnv, serviceAddress, registryAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build set the factory as register transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to set the factory as registrar: %s")
+	_ = run(txBody, "failed to set the factory as registrar: %s")
 
 	// Add the registry to the factory
 	txBody, err = blueprints.SetDeploymentRegistryTransaction(*env, bridgeEnv, serviceAddress, registryAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build add the registry to the factory transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to add the registry to the factory: %s")
+	_ = run(txBody, "failed to add the registry to the factory: %s")
 
 	// Set the factory as delegated deployer in the ERC20 deployer
 	txBody, err = blueprints.SetDelegatedDeployerTransaction(*env, bridgeEnv, serviceAddress, erc20DeployerAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build set the erc20 deployer as delegated deployer transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to set the erc20 deployer as delegated deployer: %s")
+	_ = run(txBody, "failed to set the erc20 deployer as delegated deployer: %s")
 
 	// Set the factory as delegated deployer in the ERC721 deployer
 	txBody, err = blueprints.SetDelegatedDeployerTransaction(*env, bridgeEnv, serviceAddress, erc721DeployerAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build set the erc721 deployer as delegated deployer transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to set the erc721 deployer as delegated deployer: %s")
+	_ = run(txBody, "failed to set the erc721 deployer as delegated deployer: %s")
 
 	// Add the ERC20 Deployer as a deployer in the factory
 	txBody, err = blueprints.AddDeployerTransaction(*env, bridgeEnv, serviceAddress, "ERC20", erc20DeployerAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build add the erc20 deployer in the factory transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to add the erc20 deployer in the factory: %s")
+	_ = run(txBody, "failed to add the erc20 deployer in the factory: %s")
 
 	// Add the ERC721 Deployer as a deployer in the factory
 	txBody, err = blueprints.AddDeployerTransaction(*env, bridgeEnv, serviceAddress, "ERC721", erc721DeployerAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build add the erc721 in the factory transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to add the erc721 deployer in the factory: %s")
+	_ = run(txBody, "failed to add the erc721 deployer in the factory: %s")
 
 	// 	/* --- EVM Contract Integration --- */
 
@@ -1240,28 +1240,28 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build deploy FlowEVMBridgeAccessor transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to deploy FlowEVMBridgeAccessor contract: %s")
+	_ = run(txBody, "failed to deploy FlowEVMBridgeAccessor contract: %s")
 
 	// Integrate the EVM contract with the BridgeAccessor
 	txBody, err = blueprints.IntegrateEVMWithBridgeAccessorTransaction(*env, bridgeEnv, serviceAddress)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build integrate the EVM contract with the BridgeAccessor transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to integrate the EVM contract with the BridgeAccessor: %s")
+	_ = run(txBody, "failed to integrate the EVM contract with the BridgeAccessor: %s")
 
 	// Set the bridge onboarding fees
 	txBody, err = blueprints.UpdateOnboardFeeTransaction(*env, bridgeEnv, serviceAddress, 1.0)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build update the bridge onboarding fees transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to update the bridge onboarding fees: %s")
+	_ = run(txBody, "failed to update the bridge onboarding fees: %s")
 
 	// Set the bridge base fee
 	txBody, err = blueprints.UpdateBaseFeeTransaction(*env, bridgeEnv, serviceAddress, 0.001)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build update the bridge base fees transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to update the bridge base fees: %s")
+	_ = run(txBody, "failed to update the bridge base fees: %s")
 
 	tokenChunks := bridge.GetCadenceTokenChunkedJSONArguments(false)
 	nftChunks := bridge.GetCadenceTokenChunkedJSONArguments(true)
@@ -1271,14 +1271,14 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build add the FT template code chunks transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to add the FT template code chunks: %s")
+	_ = run(txBody, "failed to add the FT template code chunks: %s")
 
 	// Add the NFT Template Cadence Code Chunks
 	txBody, err = blueprints.UpsertContractCodeChunksTransaction(*env, bridgeEnv, serviceAddress, "bridgedNFT", nftChunks)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build add the NFT template code chunks transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to add the NFT template code chunks: %s")
+	_ = run(txBody, "failed to add the NFT template code chunks: %s")
 
 	// Retrieve the WFLOW bytecode from the JSON args
 	wflowBytecode, err := bridge.GetSolidityContractCode("WFLOW")
@@ -1291,7 +1291,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build WFLOW contract in the Service Account COA transaction: %s", err))
 	}
-	txOutput = runAndReturn(txBody, "failed to deploy the WFLOW contract in the Service Account COA: %s")
+	txOutput = run(txBody, "failed to deploy the WFLOW contract in the Service Account COA: %s")
 
 	wflowAddress, err := getContractAddressFromEVMEvent(txOutput)
 	if err != nil {
@@ -1303,7 +1303,7 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build create the WFLOW token handler transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to create the WFLOW token handler: %s")
+	_ = run(txBody, "failed to create the WFLOW token handler: %s")
 
 	// Enable WFLOW Token Handler, supplying the Cadence FlowToken.Vault type
 	flowVaultType := "A." + env.FlowTokenAddress + ".FlowToken.Vault"
@@ -1312,14 +1312,14 @@ func (b *bootstrapExecutor) setupVMBridge(serviceAddress flow.Address, env *temp
 	if err != nil {
 		panic(fmt.Sprintf("failed to build enable the WFLOW token handler transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to enable the WFLOW token handler: %s")
+	_ = run(txBody, "failed to enable the WFLOW token handler: %s")
 
 	// Unpause the bridge
 	txBody, err = blueprints.PauseBridgeTransaction(*env, bridgeEnv, serviceAddress, false)
 	if err != nil {
 		panic(fmt.Sprintf("failed to build un-pause the bridge contracts transaction: %s", err))
 	}
-	runAndReturn(txBody, "failed to un-pause the bridge contracts: %s")
+	_ = run(txBody, "failed to un-pause the bridge contracts: %s")
 
 	b.output.Events = events
 }