Create peer interface. Add mock peer node.

Author: nasdf

.gitignore

@@ -16,3 +16,4 @@
 bin
 multi.json
 multi.ignore
+coverage.txt

cmd/multi/daemon.go

@@ -73,7 +73,7 @@ func daemonAction(c *cli.Context) error {
 	go rpc.ListenAndServe(node)
 
 	fmt.Printf(daemonBanner)
-	fmt.Printf("Peer ID: %s\n", node.PeerID().Pretty())
+	fmt.Printf("Peer ID: %s\n", node.ID().Pretty())
 	fmt.Printf("Web URL: %s\n", web.BindAddr)
 
 	quit := make(chan os.Signal, 1)

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/ipfs/go-ds-badger2 v0.1.0
 	github.com/ipfs/go-ipfs-blockstore v0.1.4
 	github.com/ipfs/go-ipfs-chunker v0.0.5
-	github.com/ipfs/go-ipfs-exchange-offline v0.0.1
 	github.com/ipfs/go-ipfs-files v0.0.8 // indirect
 	github.com/ipfs/go-ipfs-provider v0.4.3
 	github.com/ipfs/go-ipld-cbor v0.0.3
@@ -23,13 +22,15 @@ require (
 	github.com/ipfs/go-unixfs v0.2.4
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/libp2p/go-libp2p v0.12.0
+	github.com/libp2p/go-libp2p-blankhost v0.2.0
 	github.com/libp2p/go-libp2p-connmgr v0.2.4
 	github.com/libp2p/go-libp2p-core v0.7.0
 	github.com/libp2p/go-libp2p-kad-dht v0.11.0
 	github.com/libp2p/go-libp2p-noise v0.1.1
 	github.com/libp2p/go-libp2p-pubsub v0.4.1
 	github.com/libp2p/go-libp2p-pubsub-router v0.4.0
 	github.com/libp2p/go-libp2p-record v0.1.3
+	github.com/libp2p/go-libp2p-swarm v0.3.1
 	github.com/libp2p/go-libp2p-tls v0.1.3
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/nasdf/diff3 v0.0.1

peer/authors.go

@@ -10,11 +10,16 @@ import (
 	"github.com/multiverse-vcs/go-multiverse/p2p"
 )
 
-type authors Node
+// AuthorsAPI implements methods to manage authors.
+type AuthorsAPI struct {
+	Peer
+}
 
 // Publish advertises the local author.
-func (a *authors) Publish(ctx context.Context) error {
-	key, err := p2p.DecodeKey(a.config.PrivateKey)
+func (a *AuthorsAPI) Publish(ctx context.Context) error {
+	config := a.Config()
+
+	key, err := p2p.DecodeKey(config.PrivateKey)
 	if err != nil {
 		return err
 	}
@@ -24,7 +29,7 @@ func (a *authors) Publish(ctx context.Context) error {
 		return err
 	}
 
-	payload, err := cbornode.DumpObject(a.config.Author)
+	payload, err := cbornode.DumpObject(config.Author)
 	if err != nil {
 		return err
 	}
@@ -34,19 +39,19 @@ func (a *authors) Publish(ctx context.Context) error {
 		return err
 	}
 
-	rec := data.NewRecord(payload, a.config.Sequence, signature)
+	rec := data.NewRecord(payload, config.Sequence, signature)
 
 	val, err := cbornode.DumpObject(rec)
 	if err != nil {
 		return err
 	}
 
-	return a.namesys.PutValue(ctx, p2p.TopicForPeerID(id), val)
+	return a.Namesys().PutValue(ctx, p2p.TopicForPeerID(id), val)
 }
 
 // Search returns the author published under the given peer id.
-func (a *authors) Search(ctx context.Context, id peer.ID) (*data.Author, error) {
-	out, err := a.namesys.SearchValue(ctx, p2p.TopicForPeerID(id))
+func (a *AuthorsAPI) Search(ctx context.Context, id peer.ID) (*data.Author, error) {
+	out, err := a.Namesys().SearchValue(ctx, p2p.TopicForPeerID(id))
 	if err != nil {
 		return nil, err
 	}

peer/mock.go

@@ -0,0 +1,82 @@
+package peer
+
+import (
+	"context"
+	"testing"
+
+	ipld "github.com/ipfs/go-ipld-format"
+	"github.com/ipfs/go-merkledag/dagutils"
+	path "github.com/ipfs/go-path"
+	"github.com/ipfs/go-path/resolver"
+	bhost "github.com/libp2p/go-libp2p-blankhost"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/routing"
+	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
+	"github.com/multiverse-vcs/go-multiverse/p2p"
+)
+
+// Mock implements the peer interface.
+type Mock struct {
+	dag     ipld.DAGService
+	host    host.Host
+	config  *Config
+	resolv  *resolver.Resolver
+	namesys routing.ValueStore
+}
+
+// NewMock returns a new mock node.
+func NewMock(t *testing.T, ctx context.Context) *Mock {
+	net := swarmt.GenSwarm(t, ctx)
+	host := bhost.NewBlankHost(net)
+	dag := dagutils.NewMemoryDagService()
+	resolv := resolver.NewBasicResolver(dag)
+
+	config, err := NewConfig("")
+	if err != nil {
+		t.Fatal("failed to create peer config")
+	}
+
+	namesys, err := p2p.NewNamesys(ctx, host)
+	if err != nil {
+		t.Fatal("failed to create peer namesys")
+	}
+
+	return &Mock{
+		dag:     dag,
+		host:    host,
+		config:  config,
+		resolv:  resolv,
+		namesys: namesys,
+	}
+}
+
+// Authors returns the authors api.
+func (n *Mock) Authors() *AuthorsAPI {
+	return &AuthorsAPI{n}
+}
+
+// Config returns the peer config.
+func (n *Mock) Config() *Config {
+	return n.config
+}
+
+// Dag returns the merkledag api.
+func (n *Mock) Dag() ipld.DAGService {
+	return n.dag
+}
+
+// ID returns the peer ID of the node.
+func (n *Mock) ID() peer.ID {
+	return n.host.ID()
+}
+
+// Namesys returns the name system.
+func (n *Mock) Namesys() routing.ValueStore {
+	return n.namesys
+}
+
+// ResolvePath resolves the node from the given path.
+func (n *Mock) ResolvePath(ctx context.Context, p path.Path) (ipld.Node, error) {
+	return n.resolv.ResolvePath(ctx, p)
+}

peer/node.go

@@ -0,0 +1,117 @@
+package peer
+
+import (
+	"context"
+
+	bitswap "github.com/ipfs/go-bitswap"
+	bsnet "github.com/ipfs/go-bitswap/network"
+	blockservice "github.com/ipfs/go-blockservice"
+	datastore "github.com/ipfs/go-datastore"
+	blockstore "github.com/ipfs/go-ipfs-blockstore"
+	provider "github.com/ipfs/go-ipfs-provider"
+	ipld "github.com/ipfs/go-ipld-format"
+	merkledag "github.com/ipfs/go-merkledag"
+	path "github.com/ipfs/go-path"
+	"github.com/ipfs/go-path/resolver"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/routing"
+	"github.com/libp2p/go-libp2p-kad-dht"
+	"github.com/multiverse-vcs/go-multiverse/p2p"
+)
+
+var _ Peer = (*Node)(nil)
+
+// Node implements the peer interface
+type Node struct {
+	dag     ipld.DAGService
+	host    host.Host
+	config  *Config
+	bstore  blockstore.Blockstore
+	dstore  datastore.Batching
+	namesys routing.ValueStore
+	provsys provider.System
+	resolv  *resolver.Resolver
+	router  routing.Routing
+}
+
+// New returns a peer with a p2p host and persistent storage.
+func New(ctx context.Context, dstore datastore.Batching, config *Config) (*Node, error) {
+	priv, err := p2p.DecodeKey(config.PrivateKey)
+	if err != nil {
+		return nil, err
+	}
+
+	host, router, err := p2p.NewHost(ctx, priv)
+	if err != nil {
+		return nil, err
+	}
+
+	namesys, err := p2p.NewNamesys(ctx, host)
+	if err != nil {
+		return nil, err
+	}
+
+	bstore := blockstore.NewBlockstore(dstore)
+	net := bsnet.NewFromIpfsHost(host, router)
+	exc := bitswap.New(ctx, net, bstore)
+	bserv := blockservice.New(bstore, exc)
+	dag := merkledag.NewDAGService(bserv)
+	resolv := resolver.NewBasicResolver(dag)
+
+	provsys, err := p2p.NewProvider(ctx, dstore, bstore, router)
+	if err != nil {
+		return nil, err
+	}
+	provsys.Run()
+
+	for _, info := range dht.GetDefaultBootstrapPeerAddrInfos() {
+		go host.Connect(ctx, info)
+	}
+
+	if err := p2p.Discovery(ctx, host); err != nil {
+		return nil, err
+	}
+
+	return &Node{
+		dag:     dag,
+		host:    host,
+		config:  config,
+		bstore:  bstore,
+		dstore:  dstore,
+		resolv:  resolv,
+		router:  router,
+		provsys: provsys,
+		namesys: namesys,
+	}, nil
+}
+
+// Authors returns the authors api.
+func (n *Node) Authors() *AuthorsAPI {
+	return &AuthorsAPI{n}
+}
+
+// Config returns the peer config.
+func (n *Node) Config() *Config {
+	return n.config
+}
+
+// Dag returns the merkledag api.
+func (n *Node) Dag() ipld.DAGService {
+	return n.dag
+}
+
+// ID returns the peer ID of the node.
+func (n *Node) ID() peer.ID {
+	return n.host.ID()
+}
+
+// Namesys returns the name system.
+func (n *Node) Namesys() routing.ValueStore {
+	return n.namesys
+}
+
+// ResolvePath resolves the node from the given path.
+func (n *Node) ResolvePath(ctx context.Context, p path.Path) (ipld.Node, error) {
+	return n.resolv.ResolvePath(ctx, p)
+}