start deal, need to add mining

lotus-soup/baseline.go

@@ -4,7 +4,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
 	"math/rand"
+	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
@@ -14,6 +17,12 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/impl"
 	"github.com/ipfs/go-cid"
+	files "github.com/ipfs/go-ipfs-files"
+	ipld "github.com/ipfs/go-ipld-format"
+	dag "github.com/ipfs/go-merkledag"
+	dstest "github.com/ipfs/go-merkledag/test"
+	unixfile "github.com/ipfs/go-unixfs/file"
+	"github.com/ipld/go-car"
 	"github.com/libp2p/go-libp2p-core/peer"
 )
 
@@ -134,8 +143,10 @@ func runBaselineClient(t *TestEnvironment) error {
 	// TODO: this sleep is only necessary because deals don't immediately get logged in the dealstore, we should fix this
 	time.Sleep(time.Second)
 
-	//waitDealSealed(t, ctx, client, deal)
-	//testRetrieval(t, ctx, err, client, fcid, carExport, data)
+	waitDealSealed(ctx, client, deal)
+
+	carExport := true
+	testRetrieval(ctx, err, client, fcid, carExport, data)
 
 	// TODO broadcast published content CIDs to other clients
 	// TODO select a random piece of content published by some other client and retrieve it
@@ -194,3 +205,100 @@ func startDeal(ctx context.Context, minerActorAddr address.Address, client *impl
 	}
 	return deal
 }
+
+func waitDealSealed(ctx context.Context, client *impl.FullNodeAPI, deal *cid.Cid) {
+loop:
+	for {
+		di, err := client.ClientGetDealInfo(ctx, *deal)
+		if err != nil {
+			panic(err)
+		}
+		switch di.State {
+		case storagemarket.StorageDealProposalRejected:
+			panic("deal rejected")
+		case storagemarket.StorageDealFailing:
+			panic("deal failed")
+		case storagemarket.StorageDealError:
+			panic(fmt.Sprintf("deal errored %s", di.Message))
+		case storagemarket.StorageDealActive:
+			fmt.Println("COMPLETE", di)
+			break loop
+		}
+		fmt.Println("Deal state: ", storagemarket.DealStates[di.State])
+		time.Sleep(time.Second / 2)
+	}
+}
+
+func testRetrieval(ctx context.Context, err error, client *impl.FullNodeAPI, fcid cid.Cid, carExport bool, data []byte) {
+	offers, err := client.ClientFindData(ctx, fcid)
+	if err != nil {
+		panic(err)
+	}
+
+	if len(offers) < 1 {
+		panic("no offers")
+	}
+
+	rpath, err := ioutil.TempDir("", "lotus-retrieve-test-")
+	if err != nil {
+		panic(err)
+	}
+	defer os.RemoveAll(rpath)
+
+	caddr, err := client.WalletDefaultAddress(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	ref := &api.FileRef{
+		Path:  filepath.Join(rpath, "ret"),
+		IsCAR: carExport,
+	}
+	err = client.ClientRetrieve(ctx, offers[0].Order(caddr), ref)
+	if err != nil {
+		panic(err)
+	}
+
+	rdata, err := ioutil.ReadFile(filepath.Join(rpath, "ret"))
+	if err != nil {
+		panic(err)
+	}
+
+	if carExport {
+		rdata = extractCarData(ctx, rdata, rpath)
+	}
+
+	if !bytes.Equal(rdata, data) {
+		panic("wrong data retrieved")
+	}
+}
+
+func extractCarData(ctx context.Context, rdata []byte, rpath string) []byte {
+	bserv := dstest.Bserv()
+	ch, err := car.LoadCar(bserv.Blockstore(), bytes.NewReader(rdata))
+	if err != nil {
+		panic(err)
+	}
+	b, err := bserv.GetBlock(ctx, ch.Roots[0])
+	if err != nil {
+		panic(err)
+	}
+	nd, err := ipld.Decode(b)
+	if err != nil {
+		panic(err)
+	}
+	dserv := dag.NewDAGService(bserv)
+	fil, err := unixfile.NewUnixfsFile(ctx, dserv, nd)
+	if err != nil {
+		panic(err)
+	}
+	outPath := filepath.Join(rpath, "retLoadedCAR")
+	if err := files.WriteTo(fil, outPath); err != nil {
+		panic(err)
+	}
+	rdata, err = ioutil.ReadFile(outPath)
+	if err != nil {
+		panic(err)
+	}
+	return rdata
+}

lotus-soup/go.mod

@@ -11,7 +11,12 @@ require (
 	github.com/filecoin-project/specs-actors v0.6.2-0.20200617175406-de392ca14121
 	github.com/ipfs/go-cid v0.0.6
 	github.com/ipfs/go-datastore v0.4.4
+	github.com/ipfs/go-ipfs-files v0.0.8
+	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/ipfs/go-log/v2 v2.1.2-0.20200609205458-f8d20c392cb7
+	github.com/ipfs/go-merkledag v0.3.1
+	github.com/ipfs/go-unixfs v0.2.4
+	github.com/ipld/go-car v0.1.1-0.20200526133713-1c7508d55aae
 	github.com/libp2p/go-libp2p-core v0.6.0
 	github.com/multiformats/go-multiaddr v0.2.2
 	github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38