From fab42c9ccb5b35259f849c98405dcd7fa4328790 Mon Sep 17 00:00:00 2001
From: Andres Buritica <andres@thelinuxkid.com>
Date: Mon, 28 Dec 2015 19:02:57 -0800
Subject: [PATCH] No error if PrivateKey is already loaded

License: MIT
Signed-off-by: Andres Buritica <andres@thelinuxkid.com>
---
 core/core.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/core.go b/core/core.go
index 3f8652c32d8..6de2dc44206 100644
--- a/core/core.go
+++ b/core/core.go
@@ -434,12 +434,12 @@ func (n *IpfsNode) loadID() error {
 }
 
 func (n *IpfsNode) LoadPrivateKey() error {
-	if n.Identity == "" || n.Peerstore == nil {
-		return errors.New("loaded private key out of order.")
+	if n.PrivateKey != nil {
+		return nil
 	}
 
-	if n.PrivateKey != nil {
-		return errors.New("private key already loaded")
+	if n.Identity == "" || n.Peerstore == nil {
+		return errors.New("loaded private key out of order.")
 	}
 
 	cfg, err := n.Repo.Config()
@@ -510,10 +510,9 @@ func (n *IpfsNode) loadFilesRoot() error {
 // uses it to instantiate a routing system in offline mode.
 // This is primarily used for offline ipns modifications.
 func (n *IpfsNode) SetupOfflineRouting() error {
-	if n.PrivateKey == nil {
-		if err := n.LoadPrivateKey(); err != nil {
-			return err
-		}
+	err := n.LoadPrivateKey()
+	if err != nil {
+		return err
 	}
 
 	n.Routing = offroute.NewOfflineRouter(n.Repo.Datastore(), n.PrivateKey)