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

Modify preexisting test to reflect the simple-path car export behavior

Browse Source 
I am open to having a flag or something, as long as the behavior reflected in
deals_partial_retrieval_dm-level_test.go can be preserved for v0, and opt-in for v1
This commit is contained in:
Peter Rabbitson 2021-11-24 15:10:13 +01:00
parent 46937a1b9f
commit 407bf4961c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
itests/deals_partial_retrieval_test.go
View File

@ -31,7 +31,6 @@ var (
carCommp, _ = cid.Parse("baga6ea4seaqmrivgzei3fmx5qxtppwankmtou6zvigyjaveu3z2zzwhysgzuina") carCommp, _ = cid.Parse("baga6ea4seaqmrivgzei3fmx5qxtppwankmtou6zvigyjaveu3z2zzwhysgzuina")
carPieceSize = abi.PaddedPieceSize(2097152) carPieceSize = abi.PaddedPieceSize(2097152)
textSelector = api.Selector("8/1/8/1/0/1/0") textSelector = api.Selector("8/1/8/1/0/1/0")
storPowCid, _ = cid.Parse("bafkqaetgnfwc6mjpon2g64tbm5sxa33xmvza")
textSelectorNonLink = api.Selector("8/1/8/1/0/1") textSelectorNonLink = api.Selector("8/1/8/1/0/1")
textSelectorNonexistent = api.Selector("42") textSelectorNonexistent = api.Selector("42")
expectedResult = "fil/1/storagepower" expectedResult = "fil/1/storagepower"
@ -115,7 +114,6 @@ func TestPartialRetrieval(t *testing.T) {
Path: outFile.Name(), Path: outFile.Name(),
IsCAR: retrieveAsCar, IsCAR: retrieveAsCar,
}, },
storPowCid,
outFile, outFile,
)) ))
@ -145,7 +143,6 @@ func TestPartialRetrieval(t *testing.T) {
DAGs: []api.DagSpec{{DataSelector: &textSelectorNonexistent}}, DAGs: []api.DagSpec{{DataSelector: &textSelectorNonexistent}},
}, },
&api.FileRef{}, &api.FileRef{},
storPowCid,
nil, nil,
), ),
fmt.Sprintf("parsing dag spec: path selection does not match a node within %s", carRoot), fmt.Sprintf("parsing dag spec: path selection does not match a node within %s", carRoot),
@ -167,14 +164,13 @@ func TestPartialRetrieval(t *testing.T) {
DAGs: []api.DagSpec{{DataSelector: &textSelectorNonLink}}, DAGs: []api.DagSpec{{DataSelector: &textSelectorNonLink}},
}, },
&api.FileRef{}, &api.FileRef{},
storPowCid,
nil, nil,
), ),
fmt.Sprintf("parsing dag spec: error while locating partial retrieval sub-root: unsupported selection path '%s' does not correspond to a block boundary (a.k.a. CID link)", textSelectorNonLink), fmt.Sprintf("parsing dag spec: error while locating partial retrieval sub-root: unsupported selection path '%s' does not correspond to a block boundary (a.k.a. CID link)", textSelectorNonLink),
) )
} }
func testGenesisRetrieval(ctx context.Context, client *kit.TestFullNode, retOrder api.RetrievalOrder, eref api.ExportRef, retRef *api.FileRef, expRootCid cid.Cid, outFile *os.File) error { func testGenesisRetrieval(ctx context.Context, client *kit.TestFullNode, retOrder api.RetrievalOrder, eref api.ExportRef, retRef *api.FileRef, outFile *os.File) error {
if retOrder.Total.Nil() { if retOrder.Total.Nil() {
retOrder.Total = big.Zero() retOrder.Total = big.Zero()
@ -217,7 +213,7 @@ func testGenesisRetrieval(ctx context.Context, client *kit.TestFullNode, retOrde
if len(cr.Header.Roots) != 1 { if len(cr.Header.Roots) != 1 {
return fmt.Errorf("expected a single root in result car, got %d", len(cr.Header.Roots)) return fmt.Errorf("expected a single root in result car, got %d", len(cr.Header.Roots))
} else if cr.Header.Roots[0].String() != expRootCid.String() { } else if cr.Header.Roots[0].String() != carRoot.String() {
return fmt.Errorf("expected root cid '%s', got '%s'", carRoot.String(), cr.Header.Roots[0].String()) return fmt.Errorf("expected root cid '%s', got '%s'", carRoot.String(), cr.Header.Roots[0].String())
} }
@ -233,11 +229,11 @@ func testGenesisRetrieval(ctx context.Context, client *kit.TestFullNode, retOrde
blks = append(blks, b) blks = append(blks, b)
} }
if len(blks) != 1 { if len(blks) != 3 {
return fmt.Errorf("expected a car file with 1 blocks, got one with %d instead", len(blks)) return fmt.Errorf("expected a car file with 3 blocks, got one with %d instead", len(blks))
} }
data = blks[0].RawData() data = blks[2].RawData()
} }
if string(data) != expectedResult { if string(data) != expectedResult {