diff --git a/.changelog/4808.bugfix.md b/.changelog/4808.bugfix.md new file mode 100644 index 00000000000..e4f463e91e1 --- /dev/null +++ b/.changelog/4808.bugfix.md @@ -0,0 +1,4 @@ +net-runner: Fix regression introduced in #4564 + +Fix the missing Deployments field when oasis-net-runner generating the genesis +state and no key manager is provided. diff --git a/go/oasis-net-runner/fixtures/default.go b/go/oasis-net-runner/fixtures/default.go index 1df3b2af98a..7712092c894 100644 --- a/go/oasis-net-runner/fixtures/default.go +++ b/go/oasis-net-runner/fixtures/default.go @@ -115,9 +115,9 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) { usingKeymanager := len(viper.GetString(cfgKeymanagerBinary)) > 0 if viper.GetBool(cfgSetupRuntimes) { - fixture.Runtimes = []oasis.RuntimeFixture{ + if usingKeymanager { // Key manager runtime. - { + fixture.Runtimes = append(fixture.Runtimes, oasis.RuntimeFixture{ ID: keymanagerID, Kind: registry.KindKeyManager, Entity: 0, @@ -126,16 +126,14 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) { AnyNode: ®istry.AnyNodeRuntimeAdmissionPolicy{}, }, GovernanceModel: registry.GovernanceEntity, - }, - } - if usingKeymanager { - fixture.Runtimes[0].Deployments = []oasis.DeploymentCfg{ - { - Binaries: map[node.TEEHardware]string{ - tee: viper.GetString(cfgKeymanagerBinary), + Deployments: []oasis.DeploymentCfg{ + { + Binaries: map[node.TEEHardware]string{ + tee: viper.GetString(cfgKeymanagerBinary), + }, }, }, - } + }) fixture.KeymanagerPolicies = []oasis.KeymanagerPolicyFixture{ {Runtime: 0, Serial: 1}, } @@ -200,11 +198,12 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) { }, }, }) + rtIndex := len(fixture.Runtimes) - 1 for j := range fixture.ComputeWorkers { - fixture.ComputeWorkers[j].Runtimes = append(fixture.ComputeWorkers[j].Runtimes, i+1) + fixture.ComputeWorkers[j].Runtimes = append(fixture.ComputeWorkers[j].Runtimes, rtIndex) } - fixture.Clients[0].Runtimes = append(fixture.Clients[0].Runtimes, i+1) + fixture.Clients[0].Runtimes = append(fixture.Clients[0].Runtimes, rtIndex) } }