Merge pull request #9 from application-research/ar-test-example

chore: add ar test peer

examples/artest.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	whypfs "github.com/application-research/whypfs-core"
+	"io"
+
+	"github.com/ipfs/go-cid"
+)
+
+// Creating a new whypfs node, bootstrapping it with the default bootstrap peers, adding a file to the whypfs network, and
+// then retrieving the file from the whypfs network.
+func ArTest() {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	whypfsPeer, err := whypfs.NewNode(whypfs.NewNodeParams{
+		Ctx:       ctx,
+		Datastore: whypfs.NewInMemoryDatastore(),
+	})
+
+	whypfsPeer.BootstrapPeers(whypfs.DefaultBootstrapPeers())
+
+	c1, _ := cid.Decode("QmbJGGJkjGfYCmHqwoMjLTbUA6bdcFBbNdWChFY6dKNRWx")
+	rsc1, err := whypfsPeer.GetFile(ctx, c1)
+	if err != nil {
+		panic(err)
+	}
+	defer rsc1.Close()
+	content1, err := io.ReadAll(rsc1)
+	if err != nil {
+		panic(err)
+	}
+
+	c2, _ := cid.Decode("QmPecv5jpAPVG3LUN8fbptnaPHFzt3SRtxC8e1XZCVMiSM")
+	rsc2, err := whypfsPeer.GetFile(ctx, c2)
+	if err != nil {
+		panic(err)
+	}
+	defer rsc2.Close()
+	content2, err := io.ReadAll(rsc2)
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(string(content1))
+	fmt.Println(string(content2))
+}

examples/basicpeer.go

@@ -12,7 +12,7 @@ import (
 
 // Creating a new whypfs node, bootstrapping it with the default bootstrap peers, adding a file to the whypfs network, and
 // then retrieving the file from the whypfs network.
-func main() {
+func BasicPeer() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 

examples/dirtest.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"context"
+	whypfs "github.com/application-research/whypfs-core"
+	"github.com/ipfs/go-cid"
+)
+
+// Creating a new whypfs node, bootstrapping it with the default bootstrap peers, adding a file to the whypfs network, and
+// then retrieving the file from the whypfs network.
+func DirTest() {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	whypfsPeer, err := whypfs.NewNode(whypfs.NewNodeParams{
+		Ctx:       ctx,
+		Datastore: whypfs.NewInMemoryDatastore(),
+	})
+
+	whypfsPeer.BootstrapPeers(whypfs.DefaultBootstrapPeers())
+
+	c1, _ := cid.Decode("bafybeigvgzoolc3drupxhlevdp2ugqcrbcsqfmcek2zxiw5wctk3xjpjwy")
+	rsc1, err := whypfsPeer.GetDirectoryWithCid(ctx, c1)
+	if err != nil {
+		panic(err)
+	}
+	rsc1.GetNode()
+}

examples/main.go

@@ -0,0 +1,8 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Testing Grounds Only!")
+
+}

utils.go

@@ -18,6 +18,7 @@ var defaultTestBootstrapPeers []multiaddr.Multiaddr
 func DefaultBootstrapPeers() []peer.AddrInfo {
 
 	for _, s := range []string{
+		"/ip4/145.40.90.135/tcp/6746/p2p/12D3KooWNTiHg8eQsTRx8XV7TiJbq3379EgwG6Mo3V3MdwAfThsx",
 		"/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
 		"/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
 		"/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb",

whypfs.go

@@ -398,19 +398,19 @@ func (p *Node) setupDatastore() error {
 		}
 		p.Datastore = ds // data store.
 
-		dhtopts := fullrt.DHTOption(
-			dht.Datastore(p.Datastore),
-			dht.BootstrapPeers(DefaultBootstrapPeers()...),
-			dht.BucketSize(20),
-		)
+	}
 
-		frt, err := fullrt.NewFullRT(p.Host, dht.DefaultPrefix, dhtopts)
-		if err != nil {
-			return xerrors.Errorf("constructing fullrt: %w", err)
-		}
-		p.FullRt = frt // full routing table
+	dhtopts := fullrt.DHTOption(
+		dht.Datastore(p.Datastore),
+		dht.BootstrapPeers(DefaultBootstrapPeers()...),
+		dht.BucketSize(20),
+	)
 
+	frt, err := fullrt.NewFullRT(p.Host, dht.DefaultPrefix, dhtopts)
+	if err != nil {
+		return xerrors.Errorf("constructing fullrt: %w", err)
 	}
+	p.FullRt = frt // full routing table
 
 	//	no ipfs Dht, let's set it up for them.
 	if p.Dht == nil {
@@ -704,15 +704,11 @@ func (p *Node) GetFile(ctx context.Context, c cid.Cid) (ufsio.ReadSeekCloser, er
 
 // Getting the directory with the cid.
 func (p *Node) GetDirectoryWithCid(ctx context.Context, c cid.Cid) (ufsio.Directory, error) {
-
-	//links, _ :=
-	//nodes := ipld.GetNodes(ctx, p, []cid.Cid{c})
-
 	node, err := p.Get(ctx, c)
-
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("node", node)
 	directory, err := ufsio.NewDirectoryFromNode(p.DAGService, node)
 	if err != nil {
 		return nil, err

whypfs_test.go

@@ -4,6 +4,7 @@ package whypfs
 import (
 	"bytes"
 	"context"
+	"github.com/ipfs/go-cid"
 	leveldb "github.com/ipfs/go-ds-leveldb"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -268,24 +269,15 @@ func TestGetDirectory(t *testing.T) {
 }
 
 func TestGetDirectoryWithCid(t *testing.T) {
-	assert.Equal(t, true, true)
-	return
+
 	p1, err := NewNode(NewNodeParams{
 		Ctx:       context.Background(),
 		Datastore: NewInMemoryDatastore(),
 	})
-	pinfo1 := peer.AddrInfo{
-		ID:    p1.Host.ID(),
-		Addrs: p1.Host.Addrs(),
-	}
-	p1.BootstrapPeers([]peer.AddrInfo{pinfo1})
-	node, err := p1.AddPinDirectory(context.Background(), "./test/test_directory")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log("uploaded", node.Cid())
+	p1.BootstrapPeers(DefaultBootstrapPeers())
 
-	rsc, err := p1.GetDirectoryWithCid(context.Background(), node.Cid())
+	cid, err := cid.Decode("bafybeigvgzoolc3drupxhlevdp2ugqcrbcsqfmcek2zxiw5wctk3xjpjwy")
+	rsc, err := p1.GetDirectoryWithCid(context.Background(), cid)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -295,7 +287,7 @@ func TestGetDirectoryWithCid(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Log("retrieved root node", retrieveNode.Cid())
-	assert.Equal(t, "bafybeihnhfwlfvq6eplc4i5cnj2of2whk6aab6kc4xeryr3ttfcaawjiyi", retrieveNode.Cid().String())
+	assert.Equal(t, "bafybeigvgzoolc3drupxhlevdp2ugqcrbcsqfmcek2zxiw5wctk3xjpjwy", retrieveNode.Cid().String())
 	assert.GreaterOrEqual(t, len(retrieveNode.Links()), 1)
 }