Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipfsbstore: Fix has for non-existing blocks #5492

Merged
merged 2 commits into from
Feb 1, 2021
Merged

ipfsbstore: Fix has for non-existing blocks #5492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4da53d
ipfsbstore: Fix has for non-existing blocks
magik6k Jan 31, 2021
b2eb014
gofmt
magik6k Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions lib/ipfsbstore/ipfsbstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
)

type IpfsBstore struct {
ctx context.Context
api iface.CoreAPI
ctx context.Context
api, offlineAPI iface.CoreAPI
}

func NewIpfsBstore(ctx context.Context, onlineMode bool) (*IpfsBstore, error) {
Expand All @@ -34,10 +34,18 @@ func NewIpfsBstore(ctx context.Context, onlineMode bool) (*IpfsBstore, error) {
if err != nil {
return nil, xerrors.Errorf("setting offline mode: %s", err)
}
offlineAPI := api
if onlineMode {
offlineAPI, err = localApi.WithOptions(options.Api.Offline(true))
if err != nil {
return nil, xerrors.Errorf("applying offline mode: %s", err)
}
}

return &IpfsBstore{
ctx: ctx,
api: api,
ctx: ctx,
api: api,
offlineAPI: offlineAPI,
}, nil
}

Expand All @@ -50,10 +58,18 @@ func NewRemoteIpfsBstore(ctx context.Context, maddr multiaddr.Multiaddr, onlineM
if err != nil {
return nil, xerrors.Errorf("applying offline mode: %s", err)
}
offlineAPI := api
if onlineMode {
offlineAPI, err = httpApi.WithOptions(options.Api.Offline(true))
if err != nil {
return nil, xerrors.Errorf("applying offline mode: %s", err)
}
}

return &IpfsBstore{
ctx: ctx,
api: api,
ctx: ctx,
api: api,
offlineAPI: offlineAPI,
}, nil
}

Expand All @@ -62,7 +78,7 @@ func (i *IpfsBstore) DeleteBlock(cid cid.Cid) error {
}

func (i *IpfsBstore) Has(cid cid.Cid) (bool, error) {
_, err := i.api.Block().Stat(i.ctx, path.IpldPath(cid))
_, err := i.offlineAPI.Block().Stat(i.ctx, path.IpldPath(cid))
if err != nil {
// The underlying client is running in Offline mode.
// Stat() will fail with an err if the block isn't in the
Expand Down