Merge pull request #238 from kaleido-io/update-node-config

Remove deprecated global node config
hyperledger · Jan 30, 2023 · afc9e54 · afc9e54
2 parents 7f23b64 + 24c4264
commit afc9e54
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"`
 }