mleku/indra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring params into config.

Browse Source
This commit is contained in:
greg stone
2023-02-18 11:05:20 +00:00
parent dbe1aaf23e
commit 06b4f46a53
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/indra/seed.go
View File

@@ -50,9 +50,10 @@ var seedCmd = &cobra.Command{
log.I.Ln("-- ", log2.App, "("+viper.GetString("network")+") -", indra.SemVer, "- Network Freedom. --")
var err error
var params = cfg.SelectNetworkParams(viper.GetString("network"))
var config = server.DefaultConfig
config.Params = cfg.SelectNetworkParams(viper.GetString("network"))
if config.PrivKey, err = server.GetOrGeneratePrivKey(viper.GetString("key")); check(err) {
return
}
@@ -73,7 +74,7 @@ var seedCmd = &cobra.Command{
log.I.Ln("running serve.")
if srv, err = server.New(params, config); check(err) {
if srv, err = server.New(config); check(err) {
return
}

3
pkg/server/config.go
View File

@@ -1,6 +1,7 @@
package server
import (
"git-indra.lan/indra-labs/indra/pkg/cfg"
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/multiformats/go-multiaddr"
)
@@ -29,4 +30,6 @@ type Config struct {
SeedAddresses []multiaddr.Multiaddr
ConnectAddresses []multiaddr.Multiaddr
ListenAddresses []multiaddr.Multiaddr
Params *cfg.Params
}

8
pkg/server/server.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/multiformats/go-multiaddr"
"git-indra.lan/indra-labs/indra"
"git-indra.lan/indra-labs/indra/pkg/cfg"
"git-indra.lan/indra-labs/indra/pkg/interrupt"
"git-indra.lan/indra-labs/indra/pkg/p2p/introducer"
log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
@@ -30,8 +29,6 @@ type Server struct {
config *Config
params *cfg.Params
host host.Host
}
@@ -90,13 +87,12 @@ func (srv *Server) Serve() (err error) {
return nil
}
func New(params *cfg.Params, config *Config) (srv *Server, err error) {
func New(config *Config) (srv *Server, err error) {
log.I.Ln("initializing the server")
var s Server
s.params = params
s.config = config
if s.host, err = libp2p.New(libp2p.Identity(config.PrivKey), libp2p.UserAgent(userAgent), libp2p.ListenAddrs(config.ListenAddresses...)); check(err) {
@@ -120,7 +116,7 @@ func New(params *cfg.Params, config *Config) (srv *Server, err error) {
var seedAddresses []multiaddr.Multiaddr
if seedAddresses, err = params.ParseSeedMultiAddresses(); check(err) {
if seedAddresses, err = config.Params.ParseSeedMultiAddresses(); check(err) {
return
}