fix core NewNode not setting network field, and added new json serial…

…izer for diagnostics
ipfs · Oct 13, 2014 · 4deac3b · 4deac3b
1 parent 0a25a73
commit 4deac3b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/core/core.go b/core/core.go
@@ -108,6 +108,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		route           *dht.IpfsDHT
 		exchangeSession exchange.Interface
 		diagnostics     *diag.Diagnostics
+		network         inet.Network
 	)
 
 	if online {
@@ -135,6 +136,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		if err != nil {
 			return nil, err
 		}
+		network = net
 
 		diagnostics = diag.NewDiagnostics(local, net, diagService)
 		diagService.SetHandler(diagnostics)
@@ -173,6 +175,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		Routing:     route,
 		Namesys:     ns,
 		Diagnostics: diagnostics,
+		Network:     network,
 	}, nil
 }
 

diff --git a/diagnostics/diag.go b/diagnostics/diag.go
@@ -1,4 +1,4 @@
-package diagnostic
+package diagnostics
 
 import (
 	"bytes"

diff --git a/diagnostics/message.pb.go b/diagnostics/message.pb.go
diff --git a/diagnostics/message.proto b/diagnostics/message.proto
@@ -1,4 +1,4 @@
-package diagnostic;
+package diagnostics;
 
 message Message {
 	required string DiagID = 1;