From 542b839ec74ff0ce94ab0d34e25531f5819d95d1 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 18 May 2016 11:31:00 +0200 Subject: node, p2p: move network config out of Server This silences a go vet message about copying p2p.Server in package node. --- node/node.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'node') diff --git a/node/node.go b/node/node.go index 06a1b7aed..1f517a027 100644 --- a/node/node.go +++ b/node/node.go @@ -49,7 +49,7 @@ type Node struct { datadir string // Path to the currently used data directory eventmux *event.TypeMux // Event multiplexer used between the services of a stack - serverConfig *p2p.Server // Configuration of the underlying P2P networking layer + serverConfig p2p.Config server *p2p.Server // Currently running P2P networking layer serviceFuncs []ServiceConstructor // Service constructors (in dependency order) @@ -97,7 +97,7 @@ func New(conf *Config) (*Node, error) { } return &Node{ datadir: conf.DataDir, - serverConfig: &p2p.Server{ + serverConfig: p2p.Config{ PrivateKey: conf.NodeKey(), Name: conf.Name, Discovery: !conf.NoDiscovery, @@ -151,9 +151,7 @@ func (n *Node) Start() error { return ErrNodeRunning } // Otherwise copy and specialize the P2P configuration - running := new(p2p.Server) - *running = *n.serverConfig - + running := &p2p.Server{Config: n.serverConfig} services := make(map[reflect.Type]Service) for _, constructor := range n.serviceFuncs { // Create a new context for the particular service -- cgit v1.2.3