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

revert(markets): remove multistore on client retrieval

Browse Source 
Revert multistore functionality for retrieval client -- the need to do this is to support powergate.
we actually need an option for configuring how this command works -- so that it can use the
blockstore OR the multistore
This commit is contained in:
hannahhoward 2020-07-31 09:27:44 -07:00
parent 7c32d49ec6
commit 6b67c1cf39
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
node/impl/client/client.go
View File

@ -451,15 +451,6 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
if err != nil { if err != nil {
return xerrors.Errorf("Error in retrieval params: %s", err) return xerrors.Errorf("Error in retrieval params: %s", err)
} }
storeID, store, err := a.imgr().NewStore()
if err != nil {
return xerrors.Errorf("Error setting up new store: %w", err)
}
defer func() {
_ = a.imgr().Remove(storeID)
}()
_, err = a.Retrieval.Retrieve( _, err = a.Retrieval.Retrieve(
ctx, ctx,
order.Root, order.Root,
@ -468,7 +459,8 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
order.MinerPeerID, order.MinerPeerID,
order.Client, order.Client,
order.Miner, order.Miner,
&storeID) // TODO: should we ignore storeID if we are using the IPFS blockstore? nil) // TODO: pass the store here somehow
if err != nil { if err != nil {
return xerrors.Errorf("Retrieve failed: %w", err) return xerrors.Errorf("Retrieve failed: %w", err)
} }
@ -488,27 +480,28 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
return nil return nil
} }
rdag := merkledag.NewDAGService(blockservice.New(a.RetBstore, offline.Exchange(a.RetBstore)))
if ref.IsCAR { if ref.IsCAR {
f, err := os.OpenFile(ref.Path, os.O_CREATE|os.O_WRONLY, 0644) f, err := os.OpenFile(ref.Path, os.O_CREATE|os.O_WRONLY, 0644)
if err != nil { if err != nil {
return err return err
} }
err = car.WriteCar(ctx, store.DAG, []cid.Cid{order.Root}, f) err = car.WriteCar(ctx, rdag, []cid.Cid{order.Root}, f)
if err != nil { if err != nil {
return err return err
} }
return f.Close() return f.Close()
} }
nd, err := store.DAG.Get(ctx, order.Root) nd, err := rdag.Get(ctx, order.Root)
if err != nil { if err != nil {
return xerrors.Errorf("ClientRetrieve: %w", err) return xerrors.Errorf("ClientRetrieve: %w", err)
} }
file, err := unixfile.NewUnixfsFile(ctx, store.DAG, nd) file, err := unixfile.NewUnixfsFile(ctx, rdag, nd)
if err != nil { if err != nil {
return xerrors.Errorf("ClientRetrieve: %w", err) return xerrors.Errorf("ClientRetrieve: %w", err)
} }
return files.WriteTo(file, ref.Path) return files.WriteTo(file, ref.Path)
} }