Skip to content

Commit b386088

Browse files
whyrusleepingwhyrusleeping
authored
Merge pull request #4610 from ipfs/gx/update-1m7019
mega update
2 parents cfdcd98 + 2379aa0 commit b386088

File tree

235 files changed

+1700
-1597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+1700
-1597
lines changed

‎assets/assets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ipfs/go-ipfs/core"
1313
"github.com/ipfs/go-ipfs/core/coreunix"
1414
uio "github.com/ipfs/go-ipfs/unixfs/io"
15-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
15+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1616

1717
// this import keeps gx from thinking the dep isn't used
1818
_ "gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html"

‎blocks/blockstore/arc_cache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package blockstore
33
import (
44
"context"
55

6-
"gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
6+
"gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
77

8+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
89
"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
910
lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
10-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
11-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
11+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1212
)
1313

1414
// arccache wraps a BlockStore with an Adaptive Replacement Cache (ARC) for

‎blocks/blockstore/arc_cache_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"testing"
66

7-
"gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
7+
"gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
88

9-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
10-
syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync"
11-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
9+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
10+
syncds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
11+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1212
)
1313

1414
var exampleBlock = blocks.NewBlock([]byte("foo"))

‎blocks/blockstore/blockstore.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"sync/atomic"
1010

1111
dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
12-
blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
12+
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1313

14+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
15+
dsns "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/namespace"
16+
dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
1417
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
16-
dsns "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/namespace"
17-
dsq "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/query"
18-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
18+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1919
)
2020

2121
var log = logging.Logger("blockstore")

‎blocks/blockstore/blockstore_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"testing"
88

99
dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
10-
blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
10+
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1111

12-
u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util"
13-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
14-
dsq "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/query"
15-
ds_sync "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync"
16-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
12+
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
13+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
14+
dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
15+
ds_sync "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
16+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1717
)
1818

1919
func TestGetWhenKeyNotPresent(t *testing.T) {

‎blocks/blockstore/bloom_cache.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"sync/atomic"
66
"time"
77

8-
"gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
8+
"gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
99

1010
"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
1111
bloom "gx/ipfs/QmXqKGu7QzfRzFC4yd5aL9sThYx22vY163VGwmxfp5qGHk/bbloom"
12-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
12+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1313
)
1414

1515
// bloomCached returns a Blockstore that caches Has requests using a Bloom

‎blocks/blockstore/bloom_cache_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
"gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
9+
"gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1010

1111
context "context"
12-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
13-
dsq "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/query"
14-
syncds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync"
12+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
13+
dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
14+
syncds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
1515
)
1616

1717
func testBloomCached(ctx context.Context, bs Blockstore) (*bloomcache, error) {

‎blocks/blockstore/util/remove.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"io"
77

8-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
9-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
8+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
9+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1010

1111
bs "github.com/ipfs/go-ipfs/blocks/blockstore"
1212
"github.com/ipfs/go-ipfs/pin"

‎blocks/blocksutil/block_generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// with Blocks.
33
package blocksutil
44

5-
import "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
5+
import "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
66

77
// NewBlockGenerator returns an object capable of
88
// producing blocks.

‎blockservice/blockservice.go

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,59 @@ import (
77
"context"
88
"errors"
99
"fmt"
10+
"io"
1011

1112
"github.com/ipfs/go-ipfs/blocks/blockstore"
1213
exchange "github.com/ipfs/go-ipfs/exchange"
1314
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
1415

1516
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16-
blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
17-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
17+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
18+
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1819
)
1920

2021
var log = logging.Logger("blockservice")
2122

2223
var ErrNotFound = errors.New("blockservice: key not found")
2324

25+
// BlockGetter is the common interface shared between blockservice sessions and
26+
// the blockservice.
27+
type BlockGetter interface {
28+
// GetBlock gets the requested block.
29+
GetBlock(ctx context.Context, c *cid.Cid) (blocks.Block, error)
30+
31+
// GetBlocks does a batch request for the given cids, returning blocks as
32+
// they are found, in no particular order.
33+
//
34+
// It may not be able to find all requested blocks (or the context may
35+
// be canceled). In that case, it will close the channel early. It is up
36+
// to the consumer to detect this situation and keep track which blocks
37+
// it has received and which it hasn't.
38+
GetBlocks(ctx context.Context, ks []*cid.Cid) <-chan blocks.Block
39+
}
40+
2441
// BlockService is a hybrid block datastore. It stores data in a local
2542
// datastore and may retrieve data from a remote Exchange.
2643
// It uses an internal `datastore.Datastore` instance to store values.
2744
type BlockService interface {
45+
io.Closer
46+
BlockGetter
47+
2848
// Blockstore returns a reference to the underlying blockstore
2949
Blockstore() blockstore.Blockstore
3050

3151
// Exchange returns a reference to the underlying exchange (usually bitswap)
3252
Exchange() exchange.Interface
3353

3454
// AddBlock puts a given block to the underlying datastore
35-
AddBlock(o blocks.Block) (*cid.Cid, error)
55+
AddBlock(o blocks.Block) error
3656

3757
// AddBlocks adds a slice of blocks at the same time using batching
3858
// capabilities of the underlying datastore whenever possible.
39-
AddBlocks(bs []blocks.Block) ([]*cid.Cid, error)
59+
AddBlocks(bs []blocks.Block) error
4060

41-
GetBlock(ctx context.Context, c *cid.Cid) (blocks.Block, error)
42-
DeleteBlock(o blocks.Block) error
43-
44-
// GetBlocks does a batch request for the given cids, returning blocks as
45-
// they are found, in no particular order.
46-
GetBlocks(ctx context.Context, ks []*cid.Cid) <-chan blocks.Block
47-
48-
Close() error
61+
// DeleteBlock deletes the given block from the blockservice.
62+
DeleteBlock(o *cid.Cid) error
4963
}
5064

5165
type blockService struct {
@@ -83,12 +97,14 @@ func NewWriteThrough(bs blockstore.Blockstore, rem exchange.Interface) BlockServ
8397
}
8498
}
8599

86-
func (bs *blockService) Blockstore() blockstore.Blockstore {
87-
return bs.blockstore
100+
// Blockstore returns the blockstore behind this blockservice.
101+
func (s *blockService) Blockstore() blockstore.Blockstore {
102+
return s.blockstore
88103
}
89104

90-
func (bs *blockService) Exchange() exchange.Interface {
91-
return bs.exchange
105+
// Exchange returns the exchange behind this blockservice.
106+
func (s *blockService) Exchange() exchange.Interface {
107+
return s.exchange
92108
}
93109

94110
// NewSession creates a bitswap session that allows for controlled exchange of
@@ -110,38 +126,34 @@ func NewSession(ctx context.Context, bs BlockService) *Session {
110126

111127
// AddBlock adds a particular block to the service, Putting it into the datastore.
112128
// TODO pass a context into this if the remote.HasBlock is going to remain here.
113-
func (s *blockService) AddBlock(o blocks.Block) (*cid.Cid, error) {
129+
func (s *blockService) AddBlock(o blocks.Block) error {
114130
c := o.Cid()
115131
if s.checkFirst {
116-
has, err := s.blockstore.Has(c)
117-
if err != nil {
118-
return nil, err
119-
}
120-
121-
if has {
122-
return c, nil
132+
if has, err := s.blockstore.Has(c); has || err != nil {
133+
return err
123134
}
124135
}
125136

126-
err := s.blockstore.Put(o)
127-
if err != nil {
128-
return nil, err
137+
if err := s.blockstore.Put(o); err != nil {
138+
return err
129139
}
130140

131141
if err := s.exchange.HasBlock(o); err != nil {
132-
return nil, errors.New("blockservice is closed")
142+
// TODO(#4623): really an error?
143+
return errors.New("blockservice is closed")
133144
}
134145

135-
return c, nil
146+
return nil
136147
}
137148

138-
func (s *blockService) AddBlocks(bs []blocks.Block) ([]*cid.Cid, error) {
149+
func (s *blockService) AddBlocks(bs []blocks.Block) error {
139150
var toput []blocks.Block
140151
if s.checkFirst {
152+
toput = make([]blocks.Block, 0, len(bs))
141153
for _, b := range bs {
142154
has, err := s.blockstore.Has(b.Cid())
143155
if err != nil {
144-
return nil, err
156+
return err
145157
}
146158
if !has {
147159
toput = append(toput, b)
@@ -153,18 +165,16 @@ func (s *blockService) AddBlocks(bs []blocks.Block) ([]*cid.Cid, error) {
153165

154166
err := s.blockstore.PutMany(toput)
155167
if err != nil {
156-
return nil, err
168+
return err
157169
}
158170

159-
var ks []*cid.Cid
160171
for _, o := range toput {
161172
if err := s.exchange.HasBlock(o); err != nil {
162-
return nil, fmt.Errorf("blockservice is closed (%s)", err)
173+
// TODO(#4623): Should this really *return*?
174+
return fmt.Errorf("blockservice is closed (%s)", err)
163175
}
164-
165-
ks = append(ks, o.Cid())
166176
}
167-
return ks, nil
177+
return nil
168178
}
169179

170180
// GetBlock retrieves a particular block from the service,
@@ -256,8 +266,8 @@ func getBlocks(ctx context.Context, ks []*cid.Cid, bs blockstore.Blockstore, f e
256266
}
257267

258268
// DeleteBlock deletes a block in the blockservice from the datastore
259-
func (s *blockService) DeleteBlock(o blocks.Block) error {
260-
return s.blockstore.DeleteBlock(o.Cid())
269+
func (s *blockService) DeleteBlock(c *cid.Cid) error {
270+
return s.blockstore.DeleteBlock(c)
261271
}
262272

263273
func (s *blockService) Close() error {
@@ -280,3 +290,5 @@ func (s *Session) GetBlock(ctx context.Context, c *cid.Cid) (blocks.Block, error
280290
func (s *Session) GetBlocks(ctx context.Context, ks []*cid.Cid) <-chan blocks.Block {
281291
return getBlocks(ctx, ks, s.bs, s.ses)
282292
}
293+
294+
var _ BlockGetter = (*Session)(nil)

‎blockservice/blockservice_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"github.com/ipfs/go-ipfs/blocks/blockstore"
77
butil "github.com/ipfs/go-ipfs/blocks/blocksutil"
88
offline "github.com/ipfs/go-ipfs/exchange/offline"
9-
"gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
9+
"gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1010

11-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
12-
dssync "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync"
11+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
12+
dssync "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
1313
)
1414

1515
func TestWriteThroughWorks(t *testing.T) {

‎blockservice/test/blocks_test.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
1111
. "github.com/ipfs/go-ipfs/blockservice"
1212
offline "github.com/ipfs/go-ipfs/exchange/offline"
13-
blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
13+
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1414

15-
u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util"
16-
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
17-
dssync "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/sync"
18-
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
15+
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
16+
ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
17+
dssync "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
18+
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1919
)
2020

2121
func newObject(data []byte) blocks.Block {
@@ -33,16 +33,12 @@ func TestBlocks(t *testing.T) {
3333
t.Error("Block key and data multihash key not equal")
3434
}
3535

36-
k, err := bs.AddBlock(o)
36+
err := bs.AddBlock(o)
3737
if err != nil {
3838
t.Error("failed to add block to BlockService", err)
3939
return
4040
}
4141

42-
if !k.Equals(o.Cid()) {
43-
t.Error("returned key is not equal to block key", err)
44-
}
45-
4642
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
4743
defer cancel()
4844
b2, err := bs.GetBlock(ctx, o.Cid())

‎cmd/ipfs/daemon.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
2222
migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
2323

24-
"gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net"
24+
cmds "gx/ipfs/QmPq2D7Yoyev7yeMuMnkEYBqmQuUu5kb91UXPPoiik1Xyp/go-ipfs-cmds"
25+
"gx/ipfs/QmRK2LxanhK2gZq6k6R7vk5ZoYZk8ULSSTB7FzDsMUX6CB/go-multiaddr-net"
2526
mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus"
26-
cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds"
27-
ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr"
27+
ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
2828
"gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus"
29+
iconn "gx/ipfs/Qmamsg8biD9P9CkvWGPUkWtJZNfyeHcWu2uztXkknd3frd/go-libp2p-interface-conn"
2930
"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
30-
iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn"
3131
)
3232

3333
const (

‎cmd/ipfs/ipfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
commands "github.com/ipfs/go-ipfs/core/commands"
77

88
lgc "github.com/ipfs/go-ipfs/commands/legacy"
9-
cmds "gx/ipfs/QmUEB5nT4LG3TkUd5mkHrfRESUSgaUD4r7jSAYvvPeuWT9/go-ipfs-cmds"
9+
cmds "gx/ipfs/QmPq2D7Yoyev7yeMuMnkEYBqmQuUu5kb91UXPPoiik1Xyp/go-ipfs-cmds"
1010
)
1111

1212
// This is the CLI root, used for executing commands accessible to CLI clients.

0 commit comments

Comments
 (0)