Node: Simplify unsafeDevMode testing (#1892)
Change-Id: Ieca0f5d2765ee55b716bc4015900fd52f79d1dfe
This commit is contained in:
parent
074c98a952
commit
9ae4186e68
|
@ -435,25 +435,21 @@ func runNode(cmd *cobra.Command, args []string) {
|
||||||
*p2pBootstrap = fmt.Sprintf("/dns4/guardian-0.guardian/udp/%d/quic/p2p/%s", *p2pPort, g0key.String())
|
*p2pBootstrap = fmt.Sprintf("/dns4/guardian-0.guardian/udp/%d/quic/p2p/%s", *p2pPort, g0key.String())
|
||||||
|
|
||||||
// Deterministic ganache ETH devnet address.
|
// Deterministic ganache ETH devnet address.
|
||||||
*ethContract = devnet.GanacheWormholeContractAddress.Hex()
|
*ethContract = unsafeDevModeEvmContractAddress(*ethContract)
|
||||||
*bscContract = devnet.GanacheWormholeContractAddress.Hex()
|
*bscContract = unsafeDevModeEvmContractAddress(*bscContract)
|
||||||
*polygonContract = devnet.GanacheWormholeContractAddress.Hex()
|
*polygonContract = unsafeDevModeEvmContractAddress(*polygonContract)
|
||||||
*avalancheContract = devnet.GanacheWormholeContractAddress.Hex()
|
*avalancheContract = unsafeDevModeEvmContractAddress(*avalancheContract)
|
||||||
*oasisContract = devnet.GanacheWormholeContractAddress.Hex()
|
*oasisContract = unsafeDevModeEvmContractAddress(*oasisContract)
|
||||||
*auroraContract = devnet.GanacheWormholeContractAddress.Hex()
|
*auroraContract = unsafeDevModeEvmContractAddress(*auroraContract)
|
||||||
*fantomContract = devnet.GanacheWormholeContractAddress.Hex()
|
*fantomContract = unsafeDevModeEvmContractAddress(*fantomContract)
|
||||||
*karuraContract = devnet.GanacheWormholeContractAddress.Hex()
|
*karuraContract = unsafeDevModeEvmContractAddress(*karuraContract)
|
||||||
*acalaContract = devnet.GanacheWormholeContractAddress.Hex()
|
*acalaContract = unsafeDevModeEvmContractAddress(*acalaContract)
|
||||||
*klaytnContract = devnet.GanacheWormholeContractAddress.Hex()
|
*klaytnContract = unsafeDevModeEvmContractAddress(*klaytnContract)
|
||||||
*celoContract = devnet.GanacheWormholeContractAddress.Hex()
|
*celoContract = unsafeDevModeEvmContractAddress(*celoContract)
|
||||||
*moonbeamContract = devnet.GanacheWormholeContractAddress.Hex()
|
*moonbeamContract = unsafeDevModeEvmContractAddress(*moonbeamContract)
|
||||||
*neonContract = devnet.GanacheWormholeContractAddress.Hex()
|
*neonContract = unsafeDevModeEvmContractAddress(*neonContract)
|
||||||
if *arbitrumContract == "" {
|
*arbitrumContract = unsafeDevModeEvmContractAddress(*arbitrumContract)
|
||||||
*arbitrumContract = devnet.GanacheWormholeContractAddress.Hex()
|
*optimismContract = unsafeDevModeEvmContractAddress(*optimismContract)
|
||||||
}
|
|
||||||
if *optimismContract == "" {
|
|
||||||
*optimismContract = devnet.GanacheWormholeContractAddress.Hex()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify flags
|
// Verify flags
|
||||||
|
@ -1270,3 +1266,11 @@ func decryptTelemetryServiceAccount() ([]byte, error) {
|
||||||
func shouldStart(rpc *string) bool {
|
func shouldStart(rpc *string) bool {
|
||||||
return *rpc != "" && *rpc != "none"
|
return *rpc != "" && *rpc != "none"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func unsafeDevModeEvmContractAddress(contractAddr string) string {
|
||||||
|
if contractAddr != "" {
|
||||||
|
return contractAddr
|
||||||
|
}
|
||||||
|
|
||||||
|
return devnet.GanacheWormholeContractAddress.Hex()
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue