@@ -19,56 +19,35 @@ import (
1919var log = logger .NewNamed ("bundle-config" )
2020
2121type Config struct {
22- BundleVersion string `yaml:"bundleVersion"`
23- BundleFormat int `yaml:"bundleFormat"`
24- ExternalAddr []string `yaml:"externalAddr"`
25- ConfigID string `yaml:"configId"`
26- NetworkID string `yaml:"networkId"`
27- StoragePath string `yaml:"storagePath"`
28- Accounts Accounts `yaml:"accounts"`
29- Nodes Nodes `yaml:"nodes"`
22+ BundleVersion string `yaml:"bundleVersion"`
23+ BundleFormat int `yaml:"bundleFormat"`
24+ ExternalAddr []string `yaml:"externalAddr"`
25+ ConfigID string `yaml:"configId"`
26+ NetworkID string `yaml:"networkId"`
27+ StoragePath string `yaml:"storagePath"`
28+ Account accountservice.Config `yaml:"account"`
29+ Network NetworkConfig `yaml:"network"`
30+ Coordinator CoordinatorConfig `yaml:"coordinator"`
31+ Consensus ConsensusConfig `yaml:"consensus"`
32+ FileNode FileNodeConfig `yaml:"filenode"`
3033}
3134
32- type Accounts struct {
33- Coordinator accountservice.Config `yaml:"coordinator"`
34- Consensus accountservice.Config `yaml:"consensus"`
35- Tree accountservice.Config `yaml:"tree"`
36- File accountservice.Config `yaml:"file"`
35+ type NetworkConfig struct {
36+ ListenTCPAddr string `yaml:"listenTCPAddr"`
37+ ListenUDPAddr string `yaml:"listenUDPAddr"`
3738}
3839
39- type Nodes struct {
40- Coordinator NodeCoordinator `yaml:"coordinator"`
41- Consensus NodeConsensus `yaml:"consensus"`
42- Tree Tree `yaml:"tree"`
43- File NodeFile `yaml:"file"`
44- }
45-
46- type NodeShared struct {
47- ListenTCPAddr string `yaml:"localTCPAddr"`
48- ListenUDPAddr string `yaml:"localUDPAddr"`
49- }
50-
51- type NodeCoordinator struct {
52- NodeShared `yaml:",inline"`
53-
40+ type CoordinatorConfig struct {
5441 MongoConnect string `yaml:"mongoConnect"`
5542 MongoDatabase string `yaml:"mongoDatabase"`
5643}
5744
58- type NodeConsensus struct {
59- NodeShared `yaml:",inline"`
60-
45+ type ConsensusConfig struct {
6146 MongoConnect string `yaml:"mongoConnect"`
6247 MongoDatabase string `yaml:"mongoDatabase"`
6348}
6449
65- type Tree struct {
66- NodeShared `yaml:",inline"`
67- }
68-
69- type NodeFile struct {
70- NodeShared `yaml:",inline"`
71-
50+ type FileNodeConfig struct {
7251 RedisConnect string `yaml:"redisConnect"`
7352}
7453
@@ -146,42 +125,21 @@ func newBundleConfig(cfg *CreateOptions) *Config {
146125 ConfigID : cfgID ,
147126 NetworkID : netID ,
148127 StoragePath : cfg .StorePath ,
149- Accounts : Accounts {
150- Coordinator : newAcc (),
151- Consensus : newAcc (),
152- Tree : newAcc (),
153- File : newAcc (),
128+ Account : newAcc (),
129+ Network : NetworkConfig {
130+ ListenTCPAddr : "0.0.0.0:33010" ,
131+ ListenUDPAddr : "0.0.0.0:33020" ,
132+ },
133+ Coordinator : CoordinatorConfig {
134+ MongoConnect : cfg .MongoURI ,
135+ MongoDatabase : "coordinator" ,
136+ },
137+ Consensus : ConsensusConfig {
138+ MongoConnect : mongoConsensusURI .String (),
139+ MongoDatabase : "consensus" ,
154140 },
155- Nodes : Nodes {
156- Coordinator : NodeCoordinator {
157- NodeShared : NodeShared {
158- ListenTCPAddr : "0.0.0.0:33010" ,
159- ListenUDPAddr : "0.0.0.0:33020" ,
160- },
161- MongoConnect : cfg .MongoURI ,
162- MongoDatabase : "coordinator" ,
163- },
164- Consensus : NodeConsensus {
165- NodeShared : NodeShared {
166- ListenTCPAddr : "0.0.0.0:33010" ,
167- ListenUDPAddr : "0.0.0.0:33020" ,
168- },
169- MongoConnect : mongoConsensusURI .String (),
170- MongoDatabase : "consensus" ,
171- },
172- Tree : Tree {
173- NodeShared {
174- ListenTCPAddr : "0.0.0.0:33010" ,
175- ListenUDPAddr : "0.0.0.0:33020" ,
176- },
177- },
178- File : NodeFile {
179- NodeShared : NodeShared {
180- ListenTCPAddr : "0.0.0.0:33010" ,
181- ListenUDPAddr : "0.0.0.0:33020" ,
182- },
183- RedisConnect : cfg .RedisURI ,
184- },
141+ FileNode : FileNodeConfig {
142+ RedisConnect : cfg .RedisURI ,
185143 },
186144 }
187145
@@ -191,7 +149,7 @@ func newBundleConfig(cfg *CreateOptions) *Config {
191149 if err != nil {
192150 log .Panic ("can't encode network key to string" , zap .Error (err ))
193151 }
194- defaultCfg .Accounts . Coordinator .SigningKey = privNetKey
152+ defaultCfg .Account .SigningKey = privNetKey
195153
196154 return defaultCfg
197155}
0 commit comments