Extract: blocks/blocksutil to go-ipfs-blocksutil
License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
Hector Sanjuan committed
Apr 3, 2018 at 15:00 UTC
5eb85502abf99732fae6ef1ef2a5b1198125229f
8 files changed
+11
-61
blocks/blocksutil/block_generator.go
deleted
-35
@@ -1,35 +0,0 @@
1
-// Package blocksutil provides utility functions for working
2
-// with Blocks.
3
-package blocksutil
4
-
5
-import "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
6
-
7
-// NewBlockGenerator returns an object capable of
8
-// producing blocks.
9
-func NewBlockGenerator() BlockGenerator {
10
- return BlockGenerator{}
11
-}
12
-
13
-// BlockGenerator generates BasicBlocks on demand.
14
-// For each instace of BlockGenerator,
15
-// each new block is different from the previous,
16
-// although two different instances will produce the same.
17
-type BlockGenerator struct {
18
- seq int
19
-}
20
-
21
-// Next generates a new BasicBlock.
22
-func (bg *BlockGenerator) Next() *blocks.BasicBlock {
23
- bg.seq++
24
- return blocks.NewBlock([]byte(string(bg.seq)))
25
-}
26
-
27
-// Blocks generates as many BasicBlocks as specified by n.
28
-func (bg *BlockGenerator) Blocks(n int) []blocks.Block {
29
- blocks := make([]blocks.Block, 0, n)
30
- for i := 0; i < n; i++ {
31
- b := bg.Next()
32
- blocks = append(blocks, b)
33
- }
34
- return blocks
35
-}
blocks/blocksutil/block_generator_test.go
deleted
-19
@@ -1,19 +0,0 @@
1
-package blocksutil
2
-
3
-import "testing"
4
-
5
-func TestBlocksAreDifferent(t *testing.T) {
6
- gen := NewBlockGenerator()
7
-
8
- blocks := gen.Blocks(100)
9
-
10
- for i, block1 := range blocks {
11
- for j, block2 := range blocks {
12
- if i != j {
13
- if block1.String() == block2.String() {
14
- t.Error("Found duplicate blocks")
15
- }
16
- }
17
- }
18
- }
19
-}
blockservice/blockservice_test.go
+1
-1
@@ -3,13 +3,13 @@ package blockservice
3
import (
4
"testing"
5
6
- butil "github.com/ipfs/go-ipfs/blocks/blocksutil"
6
offline "github.com/ipfs/go-ipfs/exchange/offline"
7
8
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
9
dssync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
10
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
11
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
12
+ butil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
13
)
14
15
func TestWriteThroughWorks(t *testing.T) {
exchange/bitswap/bitswap_test.go
+1
-1
@@ -8,7 +8,6 @@ import (
8
"testing"
9
"time"
10
11
- blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
11
decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
12
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
13
@@ -21,6 +20,7 @@ import (
20
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
21
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
22
detectrace "gx/ipfs/Qmf7HqcW7LtCi1W8y2bdx2eJpze74jkbKqpByxgXikdbLF/go-detect-race"
23
+ blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
24
)
25
26
// FIXME the tests are really sensitive to the network delay. fix them to work
exchange/bitswap/notifications/notifications_test.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
"testing"
7
"time"
8
9
- blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
9
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
10
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
11
+ blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
12
)
13
14
func TestDuplicates(t *testing.T) {
exchange/bitswap/session_test.go
+1
-2
@@ -6,11 +6,10 @@ import (
6
"testing"
7
"time"
8
9
- blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
10
-
9
tu "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
10
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
11
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
12
+ blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
13
)
14
15
func TestBasicSessions(t *testing.T) {
exchange/offline/offline_test.go
+1
-2
@@ -4,14 +4,13 @@ import (
4
"context"
5
"testing"
6
7
- "github.com/ipfs/go-ipfs/blocks/blocksutil"
8
-
7
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
8
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
9
ds_sync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
10
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
11
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
12
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
13
+ blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
14
)
15
16
func TestBlockReturnsErr(t *testing.T) {
package.json
+6
@@ -593,6 +593,12 @@
593
"hash": "QmdcAXgEHUueP4A7b5hjabKn2EooeHgMreMvFC249dGCgc",
594
"name": "go-ipfs-exchange-interface",
595
"version": "0.0.1"
596
+ },
597
+ {
598
+ "author": "hsanjuan",
599
+ "hash": "Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk",
600
+ "name": "go-ipfs-blocksutil",
601
+ "version": "0.0.1"
602
}
603
],
604
"gxVersion": "0.10.0",