go/oasis-test-runner: set seed nodes only on nodes not using sentries

oasisprotocol · Jan 17, 2020 · a876333 · a876333
1 parent ccc113a
commit a876333
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/go/oasis-test-runner/oasis/args.go b/go/oasis-test-runner/oasis/args.go
@@ -318,8 +318,7 @@ func (args *argBuilder) appendSeedNodes(net *Network) *argBuilder {
 }
 
 func (args *argBuilder) appendNetwork(net *Network) *argBuilder {
-	args = args.grpcLogDebug().
-		appendSeedNodes(net)
+	args = args.grpcLogDebug()
 	return args
 }
 

diff --git a/go/oasis-test-runner/oasis/client.go b/go/oasis-test-runner/oasis/client.go
@@ -23,6 +23,7 @@ func (client *Client) startNode() error {
 		tendermintCoreListenAddress(client.consensusPort).
 		storageBackend(storageClient.BackendName).
 		appendNetwork(client.net).
+		appendSeedNodes(client.net).
 		runtimeTagIndexerBackend("bleve")
 	for _, v := range client.net.runtimes {
 		if v.kind != registry.KindCompute {

diff --git a/go/oasis-test-runner/oasis/compute.go b/go/oasis-test-runner/oasis/compute.go
@@ -89,6 +89,7 @@ func (worker *Compute) startNode() error {
 		workerRuntimeLoader(worker.net.cfg.RuntimeLoaderBinary).
 		workerTxnschedulerCheckTxEnabled().
 		appendNetwork(worker.net).
+		appendSeedNodes(worker.net).
 		appendEntity(worker.entity)
 	for _, v := range worker.net.runtimes {
 		if v.kind != registry.KindCompute {

diff --git a/go/oasis-test-runner/oasis/keymanager.go b/go/oasis-test-runner/oasis/keymanager.go
@@ -184,6 +184,7 @@ func (km *Keymanager) startNode() error {
 		workerKeymanagerRuntimeID(km.runtime.id).
 		workerKeymanagerMayGenerate().
 		appendNetwork(km.net).
+		appendSeedNodes(km.net).
 		appendEntity(km.entity)
 	if km.runtime.teeHardware != node.TEEHardwareInvalid {
 		args = args.workerKeymanagerTEEHardware(km.runtime.teeHardware)

diff --git a/go/oasis-test-runner/oasis/sentry.go b/go/oasis-test-runner/oasis/sentry.go
@@ -46,6 +46,7 @@ func (sentry *Sentry) startNode() error {
 		workerSentryControlPort(sentry.controlPort).
 		tendermintCoreListenAddress(sentry.consensusPort).
 		appendNetwork(sentry.net).
+		appendSeedNodes(sentry.net).
 		addValidatorsAsSentryUpstreams(validators)
 
 	if sentry.cmd, _, err = sentry.net.startOasisNode(sentry.dir, nil, args, sentry.Name, false, false); err != nil {

diff --git a/go/oasis-test-runner/oasis/storage.go b/go/oasis-test-runner/oasis/storage.go
@@ -83,6 +83,7 @@ func (worker *Storage) startNode() error {
 		workerStorageEnabled().
 		workerStorageDebugIgnoreApplies(worker.ignoreApplies).
 		appendNetwork(worker.net).
+		appendSeedNodes(worker.net).
 		appendEntity(worker.entity)
 	for _, v := range worker.net.runtimes {
 		if v.kind != registry.KindCompute {

diff --git a/go/oasis-test-runner/oasis/validator.go b/go/oasis-test-runner/oasis/validator.go
@@ -87,6 +87,8 @@ func (val *Validator) startNode() error {
 	if len(val.sentries) > 0 {
 		args = args.addSentries(val.sentries).
 			tendermintDisablePeerExchange()
+	} else {
+		args = args.appendSeedNodes(val.net)
 	}
 
 	if len(val.net.validators) >= 1 && val == val.net.validators[0] {