certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "node: move oasis to testnet mode" 

This reverts commit 9ad792c6ee.

commit-id:896988bd
This commit is contained in:
Leo 2021-12-21 21:55:31 +01:00 committed by Leopold Schabel
parent b59c696a6c
commit 17508ff29c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/cmd/guardiand/adminnodes.go
View File

@ -101,10 +101,10 @@ func runListNodes(cmd *cobra.Command, args []string) {
{"BSC", vaa.ChainIDBSC},
{"Polygon", vaa.ChainIDPolygon},
{"Avalanche", vaa.ChainIDAvalanche},
{"Oasis", vaa.ChainIDOasis},
}
if isTestnet {
networks = append(networks, network{"Oasis", vaa.ChainIDOasis})
networks = append(networks, network{"Ropsten", vaa.ChainIDEthereumRopsten})
}

19
node/cmd/guardiand/node.go
View File

@ -251,8 +251,8 @@ func runNode(cmd *cobra.Command, args []string) {
readiness.RegisterComponent(common.ReadinessBSCSyncing)
readiness.RegisterComponent(common.ReadinessPolygonSyncing)
readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
readiness.RegisterComponent(common.ReadinessOasisSyncing)
if *testnetMode {
readiness.RegisterComponent(common.ReadinessOasisSyncing)
readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
}
@ -342,13 +342,10 @@ func runNode(cmd *cobra.Command, args []string) {
if *avalancheRPC == "" {
logger.Fatal("Please specify --avalancheRPC")
}
if *oasisRPC == "" {
logger.Fatal("Please specify --oasisRPC")
}
if *testnetMode {
if *oasisRPC == "" {
logger.Fatal("Please specify --oasisRPC")
}
if *oasisContract == "" {
logger.Fatal("Please specify --oasisContract")
}
if *ethRopstenRPC == "" {
logger.Fatal("Please specify --ethRopstenRPC")
}
@ -569,12 +566,12 @@ func runNode(cmd *cobra.Command, args []string) {
ethereum.NewEthWatcher(*avalancheRPC, avalancheContractAddr, "avalanche", common.ReadinessAvalancheSyncing, vaa.ChainIDAvalanche, lockC, nil).Run); err != nil {
return err
}
if err := supervisor.Run(ctx, "oasiswatch",
ethereum.NewEthWatcher(*oasisRPC, oasisContractAddr, "oasis", common.ReadinessOasisSyncing, vaa.ChainIDOasis, lockC, nil).Run); err != nil {
return err
}
if *testnetMode {
if err := supervisor.Run(ctx, "oasiswatch",
ethereum.NewEthWatcher(*oasisRPC, oasisContractAddr, "oasis", common.ReadinessOasisSyncing, vaa.ChainIDOasis, lockC, nil).Run); err != nil {
return err
}
if err := supervisor.Run(ctx, "ethropstenwatch",
ethereum.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, setC).Run); err != nil {
return err