revert to explicit peerstore for persistence (textileio#327)

* revert to explicit peerstore for persistence Signed-off-by: Ignacio Hagopian <[email protected]> * add closing logic Signed-off-by: Ignacio Hagopian <[email protected]>
AbtinSetyani · Apr 29, 2020 · 87df70f · 87df70f
1 parent 61506ac
commit 87df70f
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/common/common.go b/common/common.go
@@ -14,6 +14,8 @@ import (
  host "github.com/libp2p/go-libp2p-core/host"
  "github.com/libp2p/go-libp2p-core/peer"
  "github.com/libp2p/go-libp2p-kad-dht/dual"
+ peerstore "github.com/libp2p/go-libp2p-peerstore"
+ "github.com/libp2p/go-libp2p-peerstore/pstoreds"
  ma "github.com/multiformats/go-multiaddr"
  "github.com/textileio/go-threads/core/app"
  "github.com/textileio/go-threads/logstore/lstoreds"
@@ -60,6 +62,12 @@ func DefaultNetwork(repoPath string, opts ...NetOption) (NetBoostrapper, error)
  }
 
  ctx, cancel := context.WithCancel(context.Background())
+ pstore, err := pstoreds.NewPeerstore(ctx, litestore, pstoreds.DefaultOpts())
+ if err != nil {
+ litestore.Close()
+ cancel()
+ return nil, err
+ }
  priv := util.LoadKey(filepath.Join(ipfsLitePath, "key"))
  h, d, err := ipfslite.SetupLibp2p(
  ctx,
@@ -68,6 +76,7 @@ func DefaultNetwork(repoPath string, opts ...NetOption) (NetBoostrapper, error)
  []ma.Multiaddr{config.HostAddr},
  litestore,
  libp2p.ConnectionManager(connmgr.NewConnManager(100, 400, time.Minute)),
+ libp2p.Peerstore(pstore),
  )
  if err != nil {
  cancel()
@@ -120,6 +129,7 @@ func DefaultNetwork(repoPath string, opts ...NetOption) (NetBoostrapper, error)
  cancel: cancel,
  Net: api,
  litepeer: lite,
+ pstore: pstore,
  logstore: logstore,
  litestore: litestore,
  host: h,
@@ -160,6 +170,7 @@ type netBoostrapper struct {
  cancel context.CancelFunc
  app.Net
  litepeer *ipfslite.Peer
+ pstore peerstore.Peerstore
  logstore datastore.Datastore
  litestore datastore.Datastore
  host host.Host
@@ -187,6 +198,9 @@ func (tsb *netBoostrapper) Close() error {
  if err := tsb.host.Close(); err != nil {
  return err
  }
+ if err := tsb.pstore.Close(); err != nil {
+ return err
+ }
  if err := tsb.litestore.Close(); err != nil {
  return err
  }