From 24c426470a954cc7b762a619ae600cc9b3f91559 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Wed, 25 Jan 2023 16:31:00 -0500 Subject: [PATCH] Remove deprecated global node config Signed-off-by: Nicko Guyer --- internal/core/config.go | 5 +---- internal/stacks/stack_manager.go | 5 ++++- pkg/types/firefly_config.go | 3 +-- pkg/types/namespace.go | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/core/config.go b/internal/core/config.go index 985e3e39..0281a1d3 100644 --- a/internal/core/config.go +++ b/internal/core/config.go @@ -1,4 +1,4 @@ -// Copyright © 2022 Kaleido, Inc. +// Copyright © 2023 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // @@ -58,9 +58,6 @@ func NewFireflyConfig(stack *types.Stack, member *types.Organization) *types.Fir UI: &types.UIConfig{ Path: "./frontend", }, - Node: &types.NodeConfig{ - Name: member.NodeName, - }, Event: &types.EventConfig{ DBEvents: &types.DBEventsConfig{ BufferSize: 10000, diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go index a979884d..5760570d 100644 --- a/internal/stacks/stack_manager.go +++ b/internal/stacks/stack_manager.go @@ -1,4 +1,4 @@ -// Copyright © 2021 Kaleido, Inc. +// Copyright © 2023 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // @@ -914,6 +914,9 @@ func (s *StackManager) runFirstTimeSetup(options *types.StartOptions) (messages newConfig.Namespaces.Predefined[0].Multiparty = &types.MultipartyConfig{ Enabled: true, Org: orgConfig, + Node: &types.NodeConfig{ + Name: member.NodeName, + }, Contract: []*types.ContractConfig{ { Location: contractLocation, diff --git a/pkg/types/firefly_config.go b/pkg/types/firefly_config.go index 52164b19..63968032 100644 --- a/pkg/types/firefly_config.go +++ b/pkg/types/firefly_config.go @@ -1,4 +1,4 @@ -// Copyright © 2022 Kaleido, Inc. +// Copyright © 2023 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // @@ -160,7 +160,6 @@ type FireflyConfig struct { SPI *SPIServerConfig `yaml:"spi,omitempty"` // V1.1 and later SPI Metrics *MetricsServerConfig `yaml:"metrics,omitempty"` UI *UIConfig `yaml:"ui,omitempty"` - Node *NodeConfig `yaml:"node,omitempty"` Event *EventConfig `yaml:"event,omitempty"` Plugins *Plugins `yaml:"plugins"` Namespaces *NamespacesConfig `yaml:"namespaces"` diff --git a/pkg/types/namespace.go b/pkg/types/namespace.go index 196c286a..ff1f5923 100644 --- a/pkg/types/namespace.go +++ b/pkg/types/namespace.go @@ -1,4 +1,4 @@ -// Copyright © 2022 Kaleido, Inc. +// Copyright © 2023 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // @@ -35,6 +35,7 @@ type Plugins struct { type MultipartyConfig struct { Enabled bool `yaml:"enabled"` Org *OrgConfig `yaml:"org"` + Node *NodeConfig `yaml:"node"` Contract []*ContractConfig `yaml:"contract"` }