Merge pull request #3808 from oasisprotocol/kostko/stable/21.0.x/back…

…port-3806 [BACKPORT/21.0.x] oasis-net-runner: Fix runtime configuration in default fixture
oasisprotocol · Mar 22, 2021 · 9f4745f · 9f4745f
2 parents ef09680 + fd80e99
commit 9f4745f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.changelog/3794.feature.md b/.changelog/3794.feature.md
@@ -0,0 +1 @@
+oasis-net-runner: Configure a client node even without runtimes
diff --git a/.changelog/3805.bugfix.md b/.changelog/3805.bugfix.md
@@ -0,0 +1 @@
+oasis-net-runner: Configure a runtime in default fixture
diff --git a/go/oasis-net-runner/fixtures/default.go b/go/oasis-net-runner/fixtures/default.go
@@ -90,6 +90,9 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
 		fixture.Entities = append(fixture.Entities, oasis.EntityCfg{})
 	}
 
+	// Always run a client node.
+	fixture.Clients = []oasis.ClientFixture{{}}
+
 	if viper.GetBool(cfgSetupRuntimes) {
 		fixture.Runtimes = []oasis.RuntimeFixture{
 			// Key manager runtime.
@@ -156,7 +159,7 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
 			{Entity: 1, Runtimes: []int{1}},
 			{Entity: 1, Runtimes: []int{1}},
 		}
-		fixture.Clients = []oasis.ClientFixture{{}}
+		fixture.Clients[0].Runtimes = []int{1}
 	}
 
 	return fixture, nil
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		oasis-net-runner: Configure a client node even without runtimes
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		oasis-net-runner: Configure a runtime in default fixture