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

Add initial support for identity hashes (Part 1) #5117

Merged
merged 1 commit into from
Jul 22, 2018
Merged

Add initial support for identity hashes (Part 1) #5117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions core/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,20 @@ func setupNode(ctx context.Context, n *IpfsNode, cfg *BuildCfg) error {
opts.HasBloomFilterSize = 0
}

cbs, err := bstore.CachedBlockstore(ctx, bs, opts)
wbs, err := bstore.CachedBlockstore(ctx, bs, opts)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: why is the CachedBlockstore renamed from cbs to wbs? Shouldn't wbs (which I'm not sure what it stands for) be defined later in NewIdStore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wbs stands for wrapped-data-store.

I could keep cbs and then defined yet another variable. But that could lead to bugs where cbs was used when wbs was meant to be used.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I was just saying because the following self-definition seem a bit weird to me,

wbs = bstore.NewIdStore(wbs)

and I would have expected to create it from another blockstore, not from itself, like

wbs = bstore.NewIdStore(cbs)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wbs stands for wrapped-data-store.

Shouldn't it be named wds instead? To avoid confusing it with a blockstore (like cbs).

if err != nil {
return err
}

n.BaseBlocks = cbs
wbs = bstore.NewIdStore(wbs)

n.BaseBlocks = wbs
n.GCLocker = bstore.NewGCLocker()
n.Blockstore = bstore.NewGCBlockstore(cbs, n.GCLocker)
n.Blockstore = bstore.NewGCBlockstore(wbs, n.GCLocker)

if conf.Experimental.FilestoreEnabled || conf.Experimental.UrlstoreEnabled {
// hash security
n.Filestore = filestore.NewFilestore(cbs, n.Repo.FileManager())
n.Filestore = filestore.NewFilestore(wbs, n.Repo.FileManager())
n.Blockstore = bstore.NewGCBlockstore(n.Filestore, n.GCLocker)
n.Blockstore = &verifbs.VerifBSGC{GCBlockstore: n.Blockstore}
}
Expand Down
74 changes: 74 additions & 0 deletions test/sharness/t0046-id-hash.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
#!/usr/bin/env bash

test_description="Test basic operations with identity hash"

. lib/test-lib.sh

test_init_ipfs

ID_HASH0=z25RnHTQ7DveGAsV6YDSDR8EkWvD
ID_HASH0_CONTENTS=jkD98jkD975hkD8

test_expect_success "can fetch random id hash" '
ipfs cat $ID_HASH0 > expected &&
echo $ID_HASH0_CONTENTS > actual &&
test_cmp expected actual
'

test_expect_success "can pin random id hash" '
ipfs pin add $ID_HASH0
'

test_expect_success "ipfs add succeeds with id hash" '
echo "djkd7jdkd7jkHHG" > junk.txt &&
HASH=$(ipfs add -q --hash=id junk.txt)
'

test_expect_success "content not actually added" '
ipfs refs local | fgrep -q -v $HASH
'

test_expect_success "but can fetch it anyway" '
ipfs cat $HASH > actual &&
test_cmp junk.txt actual
'

test_expect_success "block rm does nothing" '
ipfs pin rm $HASH &&
ipfs block rm $HASH
'

test_expect_success "can still fetch it" '
ipfs cat $HASH > actual
test_cmp junk.txt actual
'

test_expect_success "enable filestore" '
ipfs config --json Experimental.FilestoreEnabled true
'

test_expect_success "can fetch random id hash (filestore enabled)" '
ipfs cat $ID_HASH0 > expected &&
echo $ID_HASH0_CONTENTS > actual &&
test_cmp expected actual
'

test_expect_success "can pin random id hash (filestore enabled)" '
ipfs pin add $ID_HASH0
'

test_expect_success "ipfs add succeeds with id hash and --nocopy" '
echo "djkd7jdkd7jkHHG" > junk.txt &&
HASH=$(ipfs add -q --hash=id --nocopy junk.txt)
'

test_expect_success "content not actually added (filestore enabled)" '
ipfs refs local | fgrep -q -v $HASH
'

test_expect_success "but can fetch it anyway (filestore enabled)" '
ipfs cat $HASH > actual &&
test_cmp junk.txt actual
'

test_done