aboutsummaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authoraaronbuchwald <[email protected]>2020-11-30 12:22:29 -0500
committerGitHub <[email protected]>2020-11-30 12:22:29 -0500
commitcfc11729d0f24b8e42a3f9cbcf7534e2db09d720 (patch)
tree9478961d310c5b69ca65fc9551ef9976b1d01da5 /node
parentae4541f42a666fb5ae1c36d6f7423c3d9eb2c875 (diff)
parent415b1eb564efc70cf7e673358286e19de8551fbf (diff)
Merge pull request #62 from ava-labs/devv0.3.15
Dev
Diffstat (limited to 'node')
-rw-r--r--node/node.go37
1 files changed, 19 insertions, 18 deletions
diff --git a/node/node.go b/node/node.go
index 3ed89ed..e0a6424 100644
--- a/node/node.go
+++ b/node/node.go
@@ -113,8 +113,8 @@ func New(conf *Config) (*Node, error) {
eventmux: new(event.TypeMux),
log: conf.Logger,
stop: make(chan struct{}),
- server: &p2p.Server{Config: conf.P2P},
- databases: make(map[*closeTrackingDB]struct{}),
+ // server: &p2p.Server{Config: conf.P2P},
+ databases: make(map[*closeTrackingDB]struct{}),
}
// Register built-in APIs.
@@ -133,19 +133,19 @@ func New(conf *Config) (*Node, error) {
node.accman = am
node.ephemKeystore = ephemeralKeystore
- // Initialize the p2p server. This creates the node key and discovery databases.
- node.server.Config.PrivateKey = node.config.NodeKey()
- node.server.Config.Name = node.config.NodeName()
- node.server.Config.Logger = node.log
- if node.server.Config.StaticNodes == nil {
- node.server.Config.StaticNodes = node.config.StaticNodes()
- }
- if node.server.Config.TrustedNodes == nil {
- node.server.Config.TrustedNodes = node.config.TrustedNodes()
- }
- if node.server.Config.NodeDatabase == "" {
- node.server.Config.NodeDatabase = node.config.NodeDB()
- }
+ // // Initialize the p2p server. This creates the node key and discovery databases.
+ // node.server.Config.PrivateKey = node.config.NodeKey()
+ // node.server.Config.Name = node.config.NodeName()
+ // node.server.Config.Logger = node.log
+ // if node.server.Config.StaticNodes == nil {
+ // node.server.Config.StaticNodes = node.config.StaticNodes()
+ // }
+ // if node.server.Config.TrustedNodes == nil {
+ // node.server.Config.TrustedNodes = node.config.TrustedNodes()
+ // }
+ // if node.server.Config.NodeDatabase == "" {
+ // node.server.Config.NodeDatabase = node.config.NodeDB()
+ // }
// Configure RPC servers.
@@ -161,10 +161,11 @@ func (n *Node) Config() *Config {
// only to inspect fields of the currently running server. Callers should not
// start or stop the returned server.
func (n *Node) Server() *p2p.Server {
- n.lock.Lock()
- defer n.lock.Unlock()
+ // n.lock.Lock()
+ // defer n.lock.Unlock()
- return n.server
+ // return n.server
+ return nil
}
// DataDir retrieves the current datadir used by the protocol stack.