From 6c3c73dee471ca54c25ba915d020a1725a99910f Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 20 Apr 2018 09:31:38 +0900 Subject: [PATCH 1/3] cleanup swarm key open logic License: MIT Signed-off-by: Steven Allen --- repo/fsrepo/fsrepo.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go index 073faaa0a..4ecb3ec9a 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -701,15 +701,11 @@ func (r *FSRepo) SwarmKey() ([]byte, error) { f, err := os.Open(spath) if err != nil { if os.IsNotExist(err) { - return nil, nil - } else { - return nil, err + err = nil } - } - defer f.Close() - if err != nil { return nil, err } + defer f.Close() return ioutil.ReadAll(f) } From 6cf42b54b6135530ce7df8c25d6593991091e986 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 20 Apr 2018 09:31:52 +0900 Subject: [PATCH 2/3] report error source when failing to construct private network fixes #4951 License: MIT Signed-off-by: Steven Allen --- core/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.go b/core/core.go index 890a2f7bf..08f30baae 100644 --- a/core/core.go +++ b/core/core.go @@ -193,7 +193,7 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin if swarmkey != nil { protec, err = pnet.NewProtector(bytes.NewReader(swarmkey)) if err != nil { - return err + return fmt.Errorf("failed to configure private network: ", err) } n.PNetFingerprint = protec.Fingerprint() go func() { From 0aa9c0d3e6f6923604df5080da26a628f8bc0617 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 9 May 2018 15:34:05 +0200 Subject: [PATCH 3/3] fix: format of pnet error message License: MIT Signed-off-by: Jakub Sztandera --- core/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.go b/core/core.go index 08f30baae..fa6b273f2 100644 --- a/core/core.go +++ b/core/core.go @@ -193,7 +193,7 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin if swarmkey != nil { protec, err = pnet.NewProtector(bytes.NewReader(swarmkey)) if err != nil { - return fmt.Errorf("failed to configure private network: ", err) + return fmt.Errorf("failed to configure private network: %s", err) } n.PNetFingerprint = protec.Fingerprint() go func() {