node: move oasis to testnet mode

We're not ready to release this yet.

commit-id:c2d6531f
This commit is contained in:
Leo 2021-12-21 20:03:46 +01:00 committed by Leopold Schabel
parent 40d1a57167
commit 9ad792c6ee
2 changed files with 12 additions and 9 deletions

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})
}

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,10 +342,13 @@ 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")
}
@ -566,12 +569,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