cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

use the full node api instead of breaking abstraction barriers

Browse Source
This commit is contained in:
vyzo 2020-06-25 15:14:27 +03:00
parent 6f298b929e
commit 889b440bb1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lotus-soup/baseline.go
View File

@ -14,7 +14,6 @@ import (
"github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/node/impl"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
files "github.com/ipfs/go-ipfs-files" files "github.com/ipfs/go-ipfs-files"
ipld "github.com/ipfs/go-ipld-format" ipld "github.com/ipfs/go-ipld-format"
@ -121,11 +120,10 @@ func runBaselineClient(t *TestEnvironment) error {
if err != nil { if err != nil {
return err return err
} }
client := cl.fullApi.(*impl.FullNodeAPI)
t.RecordMessage("got %v miner addrs", len(addrs)) t.RecordMessage("got %v miner addrs", len(addrs))
client := cl.fullApi
// select a random miner // select a random miner
minerAddr := addrs[rand.Intn(len(addrs))] minerAddr := addrs[rand.Intn(len(addrs))]
if err := client.NetConnect(ctx, minerAddr.PeerAddr); err != nil { if err := client.NetConnect(ctx, minerAddr.PeerAddr); err != nil {
@ -139,8 +137,13 @@ func runBaselineClient(t *TestEnvironment) error {
// generate random data // generate random data
data := make([]byte, 1600) data := make([]byte, 1600)
rand.New(rand.NewSource(time.Now().UnixNano())).Read(data) rand.New(rand.NewSource(time.Now().UnixNano())).Read(data)
r := bytes.NewReader(data)
fcid, err := client.ClientImportLocal(ctx, r) err = ioutil.WriteFile("/tmp/data", data, 0755)
if err != nil {
return err
}
fcid, err := client.ClientImport(ctx, api.FileRef{Path: "/tmp/data", IsCAR: false})
if err != nil { if err != nil {
return err return err
} }
@ -170,7 +173,7 @@ func runBaselineClient(t *TestEnvironment) error {
return nil return nil
} }
func startDeal(ctx context.Context, minerActorAddr address.Address, client *impl.FullNodeAPI, fcid cid.Cid) *cid.Cid { func startDeal(ctx context.Context, minerActorAddr address.Address, client api.FullNode, fcid cid.Cid) *cid.Cid {
addr, err := client.WalletDefaultAddress(ctx) addr, err := client.WalletDefaultAddress(ctx)
if err != nil { if err != nil {
panic(err) panic(err)
@ -189,7 +192,7 @@ func startDeal(ctx context.Context, minerActorAddr address.Address, client *impl
return deal return deal
} }
func waitDealSealed(t *TestEnvironment, ctx context.Context, client *impl.FullNodeAPI, deal *cid.Cid) { func waitDealSealed(t *TestEnvironment, ctx context.Context, client api.FullNode, deal *cid.Cid) {
loop: loop:
for { for {
di, err := client.ClientGetDealInfo(ctx, *deal) di, err := client.ClientGetDealInfo(ctx, *deal)
@ -212,7 +215,7 @@ loop:
} }
} }
func retrieveData(t *TestEnvironment, ctx context.Context, err error, client *impl.FullNodeAPI, fcid cid.Cid, carExport bool, data []byte) { func retrieveData(t *TestEnvironment, ctx context.Context, err error, client api.FullNode, fcid cid.Cid, carExport bool, data []byte) {
offers, err := client.ClientFindData(ctx, fcid) offers, err := client.ClientFindData(ctx, fcid)
if err != nil { if err != nil {
panic(err) panic(err)