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

get tests working

Browse Source
This commit is contained in:
Aarsh Shah 2022-01-12 16:55:45 +04:00
parent 05afaf6094
commit b9d3585f4c
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
itests/deals_anycid_test.go
View File

@ -129,12 +129,13 @@ func TestDealRetrieveByAnyCid(t *testing.T) {
require.Empty(t, offer.Err) require.Empty(t, offer.Err)
// retrieve in a CAR file and ensure roots match // retrieve in a CAR file and ensure roots match
outputCar := dh.PerformRetrieval(ctx, dealCid, targetCid, true) outputCar := dh.PerformRetrieval(ctx, dealCid, targetCid, true, offer)
_, err = os.Stat(outputCar) _, err = os.Stat(outputCar)
require.NoError(t, err) require.NoError(t, err)
f, err := os.Open(outputCar) f, err := os.Open(outputCar)
require.NoError(t, err) require.NoError(t, err)
ch, _ := car.ReadHeader(bufio.NewReader(f)) ch, err := car.ReadHeader(bufio.NewReader(f))
require.NoError(t, err)
require.EqualValues(t, ch.Roots[0], targetCid) require.EqualValues(t, ch.Roots[0], targetCid)
require.NoError(t, f.Close()) require.NoError(t, f.Close())

27
itests/kit/deals.go
View File

@ -306,14 +306,20 @@ func (dh *DealHarness) StartSealingWaiting(ctx context.Context) {
} }
} }
func (dh *DealHarness) PerformRetrieval(ctx context.Context, deal *cid.Cid, root cid.Cid, carExport bool) (path string) { func (dh *DealHarness) PerformRetrieval(ctx context.Context, deal *cid.Cid, root cid.Cid, carExport bool, offers ...api.QueryOffer) (path string) {
// perform retrieval. var offer api.QueryOffer
info, err := dh.client.ClientGetDealInfo(ctx, *deal) if len(offers) == 0 {
require.NoError(dh.t, err) // perform retrieval.
info, err := dh.client.ClientGetDealInfo(ctx, *deal)
require.NoError(dh.t, err)
offers, err := dh.client.ClientFindData(ctx, root, &info.PieceCID) offers, err := dh.client.ClientFindData(ctx, root, &info.PieceCID)
require.NoError(dh.t, err) require.NoError(dh.t, err)
require.NotEmpty(dh.t, offers, "no offers") require.NotEmpty(dh.t, offers, "no offers")
offer = offers[0]
} else {
offer = offers[0]
}
carFile, err := ioutil.TempFile(dh.t.TempDir(), "ret-car") carFile, err := ioutil.TempFile(dh.t.TempDir(), "ret-car")
require.NoError(dh.t, err) require.NoError(dh.t, err)
@ -327,7 +333,7 @@ func (dh *DealHarness) PerformRetrieval(ctx context.Context, deal *cid.Cid, root
updates, err := dh.client.ClientGetRetrievalUpdates(updatesCtx) updates, err := dh.client.ClientGetRetrievalUpdates(updatesCtx)
require.NoError(dh.t, err) require.NoError(dh.t, err)
retrievalRes, err := dh.client.ClientRetrieve(ctx, offers[0].Order(caddr)) retrievalRes, err := dh.client.ClientRetrieve(ctx, offer.Order(caddr))
require.NoError(dh.t, err) require.NoError(dh.t, err)
consumeEvents: consumeEvents:
for { for {
@ -364,11 +370,6 @@ consumeEvents:
})) }))
ret := carFile.Name() ret := carFile.Name()
if carExport {
actualFile := dh.ExtractFileFromCAR(ctx, carFile)
ret = actualFile.Name()
_ = actualFile.Close() //nolint:errcheck
}
return ret return ret
} }