Merge pull request #576 from libp2p/fix/constructor-nits

Stebalien · web-flow · commit beb02be512e3 · 2019-04-06T08:36:32.000-07:00
chore: fail in the libp2p constructor if we fail to store the key
diff --git a/config/config.go b/config/config.go
@@ -99,8 +99,12 @@ func (cfg *Config) NewNode(ctx context.Context) (host.Host, error) {
 	}
 
 	if !cfg.Insecure {
-		cfg.Peerstore.AddPrivKey(pid, cfg.PeerKey)
-		cfg.Peerstore.AddPubKey(pid, cfg.PeerKey.GetPublic())
+		if err := cfg.Peerstore.AddPrivKey(pid, cfg.PeerKey); err != nil {
+			return nil, err
+		}
+		if err := cfg.Peerstore.AddPubKey(pid, cfg.PeerKey.GetPublic()); err != nil {
+			return nil, err
+		}
 	}
 
 	// TODO: Make the swarm implementation configurable.

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,12 @@ func (cfg *Config) NewNode(ctx context.Context) (host.Host, error) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if !cfg.Insecure {`
`102`		`- cfg.Peerstore.AddPrivKey(pid, cfg.PeerKey)`
`103`		`- cfg.Peerstore.AddPubKey(pid, cfg.PeerKey.GetPublic())`
	`102`	`+ if err := cfg.Peerstore.AddPrivKey(pid, cfg.PeerKey); err != nil {`
	`103`	`+ return nil, err`
	`104`	`+ }`
	`105`	`+ if err := cfg.Peerstore.AddPubKey(pid, cfg.PeerKey.GetPublic()); err != nil {`
	`106`	`+ return nil, err`
	`107`	`+ }`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`// TODO: Make the swarm implementation configurable.`