w1p: Multiple validators

oasisprotocol · Oct 7, 2020 · 2c80821 · 2c80821
1 parent dee43c7
commit 2c80821
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/go/extra/conbench/conbench-test.sh b/go/extra/conbench/conbench-test.sh
@@ -48,8 +48,9 @@ printf "${GRN}### Starting the test network...${OFF}\n"
 ${OASIS_NET_RUNNER} \
 	--fixture.default.setup_runtimes=false \
 	--fixture.default.num_entities=1 \
+	--fixture.default.num_validators=4 \
 	--fixture.default.disable_supplementary_sanity_checks=true \
-	--fixture.default.timeout_commit=1ms \
+	--fixture.default.timeout_commit=100ms \
 	--basedir.no_temp_dir \
 	--basedir "${TEST_BASE_DIR}" &
 

diff --git a/go/oasis-net-runner/fixtures/default.go b/go/oasis-net-runner/fixtures/default.go
@@ -23,6 +23,7 @@ const (
 	cfgKeymanagerBinary        = "fixture.default.keymanager.binary"
 	cfgNodeBinary              = "fixture.default.node.binary"
 	cfgNumEntities             = "fixture.default.num_entities"
+	cfgNumValidators           = "fixture.default.num_validators"
 	cfgRuntimeBinary           = "fixture.default.runtime.binary"
 	cfgRuntimeGenesisState     = "fixture.default.runtime.genesis_state"
 	cfgRuntimeLoader           = "fixture.default.runtime.loader"
@@ -84,6 +85,12 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
 		fixture.Entities = append(fixture.Entities, oasis.EntityCfg{})
 	}
 
+	for i := 0; i < viper.GetInt(cfgNumValidators); i++ {
+		fixture.Validators = append(fixture.Validators, oasis.ValidatorFixture{
+			Entity: 1, Consensus: oasis.ConsensusFixture{DisableSupplementarySanityChecks: viper.GetBool(cfgDisableSupSanityChecks)},
+		})
+	}
+
 	if viper.GetBool(cfgSetupRuntimes) {
 		fixture.Runtimes = []oasis.RuntimeFixture{
 			// Key manager runtime.
@@ -156,6 +163,7 @@ func init() {
 	DefaultFixtureFlags.Bool(cfgSetupRuntimes, true, "initialize the network with runtimes and runtime nodes")
 	DefaultFixtureFlags.Bool(cfgDisableSupSanityChecks, false, "disable supplementary sanity checks")
 	DefaultFixtureFlags.Int(cfgNumEntities, 1, "number of (non debug) entities in genesis")
+	DefaultFixtureFlags.Int(cfgNumValidators, 1, "number of validator nodes")
 	DefaultFixtureFlags.String(cfgKeymanagerBinary, "simple-keymanager", "path to the keymanager runtime")
 	DefaultFixtureFlags.String(cfgNodeBinary, "oasis-node", "path to the oasis-node binary")
 	DefaultFixtureFlags.String(cfgRuntimeBinary, "simple-keyvalue", "path to the runtime binary")