From f2db4b77ac03e6785ea1feabbe8263b8968a282a Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Tue, 23 Sep 2014 05:02:02 -0700 Subject: [PATCH] don't load identity in offline mode (temp) **For now**, we don't need to load/parse the private key (which causes a signficant delay in commands) when doing things entirely offline. This may change, and in that case the private key should be loaded on demand. --- core/core.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/core.go b/core/core.go index 6e6cf8dae..94eb1bb22 100644 --- a/core/core.go +++ b/core/core.go @@ -74,11 +74,6 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) { return nil, err } - local, err := initIdentity(cfg) - if err != nil { - return nil, err - } - peerstore := peer.NewPeerstore() // FIXME(brian): This is a bit dangerous. If any of the vars declared in @@ -90,12 +85,20 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) { // TODO: refactor so we can use IpfsRouting interface instead of being DHT-specific route *dht.IpfsDHT exchangeSession exchange.Interface + local *peer.Peer ) if online { // add protocol services here. ctx := context.TODO() // derive this from a higher context. + // when not online, don't need to parse private keys (yet) + local, err := initIdentity(cfg) + if err != nil { + cancel() + return nil, err + } + dhtService := netservice.NewService(nil) // nil handler for now, need to patch it exchangeService := netservice.NewService(nil) // nil handler for now, need to patch it