diff --git a/api/api_full.go b/api/api_full.go index 139f0326c..8c720588b 100644 --- a/api/api_full.go +++ b/api/api_full.go @@ -934,7 +934,7 @@ type MarketDeal struct { type RetrievalOrder struct { // TODO: make this less unixfs specific - Root cid.Cid + Root cid.Cid Piece *cid.Cid DataSelector *Selector Size uint64 diff --git a/api/types.go b/api/types.go index 05f86fa88..330263f8a 100644 --- a/api/types.go +++ b/api/types.go @@ -222,7 +222,7 @@ type DagSpec struct { } type ExportRef struct { - Root cid.Cid + Root cid.Cid // DAGs array specifies a list of DAGs to export // - If exporting into a car file, defines car roots diff --git a/api/v0api/v1_wrapper.go b/api/v0api/v1_wrapper.go index 5418d99c7..4626f0d06 100644 --- a/api/v0api/v1_wrapper.go +++ b/api/v0api/v1_wrapper.go @@ -321,9 +321,9 @@ func (w *WrapperV1Full) clientRetrieve(ctx context.Context, order RetrievalOrder } eref := api.ExportRef{ - Root: order.Root, - FromLocalCAR: order.FromLocalCAR, - DealID: dealID, + Root: order.Root, + FromLocalCAR: order.FromLocalCAR, + DealID: dealID, } if order.DatamodelPathSelector != nil { diff --git a/itests/deals_partial_retrieval_test.go b/itests/deals_partial_retrieval_test.go index 9eeae3692..bb9611594 100644 --- a/itests/deals_partial_retrieval_test.go +++ b/itests/deals_partial_retrieval_test.go @@ -31,7 +31,7 @@ var ( carCommp, _ = cid.Parse("baga6ea4seaqmrivgzei3fmx5qxtppwankmtou6zvigyjaveu3z2zzwhysgzuina") carPieceSize = abi.PaddedPieceSize(2097152) textSelector = api.Selector("8/1/8/1/0/1/0") - storPowCid, _ = cid.Parse("bafkqaetgnfwc6mjpon2g64tbm5sxa33xmvza") + storPowCid, _ = cid.Parse("bafkqaetgnfwc6mjpon2g64tbm5sxa33xmvza") textSelectorNonLink = api.Selector("8/1/8/1/0/1") textSelectorNonexistent = api.Selector("42") expectedResult = "fil/1/storagepower" @@ -140,9 +140,9 @@ func TestPartialRetrieval(t *testing.T) { DataSelector: &textSelectorNonexistent, }, api.ExportRef{ - Root: carRoot, - FromLocalCAR: sourceCar, - DAGs: []api.DagSpec{{DataSelector: &textSelectorNonexistent}}, + Root: carRoot, + FromLocalCAR: sourceCar, + DAGs: []api.DagSpec{{DataSelector: &textSelectorNonexistent}}, }, &api.FileRef{}, storPowCid, @@ -162,9 +162,9 @@ func TestPartialRetrieval(t *testing.T) { DataSelector: &textSelectorNonLink, }, api.ExportRef{ - Root: carRoot, - FromLocalCAR: sourceCar, - DAGs: []api.DagSpec{{DataSelector: &textSelectorNonLink}}, + Root: carRoot, + FromLocalCAR: sourceCar, + DAGs: []api.DagSpec{{DataSelector: &textSelectorNonLink}}, }, &api.FileRef{}, storPowCid, diff --git a/node/impl/client/client.go b/node/impl/client/client.go index 5ea620110..a32f13d06 100644 --- a/node/impl/client/client.go +++ b/node/impl/client/client.go @@ -989,7 +989,7 @@ func (a *API) outputCAR(ctx context.Context, dags []dagSpec, bs bstore.Blockstor } type dagSpec struct { - root cid.Cid + root cid.Cid selector ipld.Node }