diff --git a/blocks/blocksutil/block_generator.go b/blocks/blocksutil/block_generator.go deleted file mode 100644 index 1161fa820..000000000 --- a/blocks/blocksutil/block_generator.go +++ /dev/null @@ -1,35 +0,0 @@ -// Package blocksutil provides utility functions for working -// with Blocks. -package blocksutil - -import "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" - -// NewBlockGenerator returns an object capable of -// producing blocks. -func NewBlockGenerator() BlockGenerator { - return BlockGenerator{} -} - -// BlockGenerator generates BasicBlocks on demand. -// For each instace of BlockGenerator, -// each new block is different from the previous, -// although two different instances will produce the same. -type BlockGenerator struct { - seq int -} - -// Next generates a new BasicBlock. -func (bg *BlockGenerator) Next() *blocks.BasicBlock { - bg.seq++ - return blocks.NewBlock([]byte(string(bg.seq))) -} - -// Blocks generates as many BasicBlocks as specified by n. -func (bg *BlockGenerator) Blocks(n int) []blocks.Block { - blocks := make([]blocks.Block, 0, n) - for i := 0; i < n; i++ { - b := bg.Next() - blocks = append(blocks, b) - } - return blocks -} diff --git a/blocks/blocksutil/block_generator_test.go b/blocks/blocksutil/block_generator_test.go deleted file mode 100644 index 014beee4b..000000000 --- a/blocks/blocksutil/block_generator_test.go +++ /dev/null @@ -1,19 +0,0 @@ -package blocksutil - -import "testing" - -func TestBlocksAreDifferent(t *testing.T) { - gen := NewBlockGenerator() - - blocks := gen.Blocks(100) - - for i, block1 := range blocks { - for j, block2 := range blocks { - if i != j { - if block1.String() == block2.String() { - t.Error("Found duplicate blocks") - } - } - } - } -} diff --git a/blockservice/blockservice_test.go b/blockservice/blockservice_test.go index edcd4cd98..77e664568 100644 --- a/blockservice/blockservice_test.go +++ b/blockservice/blockservice_test.go @@ -3,13 +3,13 @@ package blockservice import ( "testing" - butil "github.com/ipfs/go-ipfs/blocks/blocksutil" offline "github.com/ipfs/go-ipfs/exchange/offline" ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore" dssync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync" blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" + butil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil" ) func TestWriteThroughWorks(t *testing.T) { diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go index 1cc8b2d94..e3ddd4f8c 100644 --- a/exchange/bitswap/bitswap_test.go +++ b/exchange/bitswap/bitswap_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet" @@ -21,6 +20,7 @@ import ( cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" detectrace "gx/ipfs/Qmf7HqcW7LtCi1W8y2bdx2eJpze74jkbKqpByxgXikdbLF/go-detect-race" + blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil" ) // FIXME the tests are really sensitive to the network delay. fix them to work diff --git a/exchange/bitswap/notifications/notifications_test.go b/exchange/bitswap/notifications/notifications_test.go index a70a0755a..5c15975db 100644 --- a/exchange/bitswap/notifications/notifications_test.go +++ b/exchange/bitswap/notifications/notifications_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" + blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil" ) func TestDuplicates(t *testing.T) { diff --git a/exchange/bitswap/session_test.go b/exchange/bitswap/session_test.go index 75e4da038..cfcf00238 100644 --- a/exchange/bitswap/session_test.go +++ b/exchange/bitswap/session_test.go @@ -6,11 +6,10 @@ import ( "testing" "time" - blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil" - tu "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" + blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil" ) func TestBasicSessions(t *testing.T) { diff --git a/exchange/offline/offline_test.go b/exchange/offline/offline_test.go index 19f2d77ae..487d188a0 100644 --- a/exchange/offline/offline_test.go +++ b/exchange/offline/offline_test.go @@ -4,14 +4,13 @@ import ( "context" "testing" - "github.com/ipfs/go-ipfs/blocks/blocksutil" - u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util" ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore" ds_sync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync" blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" + blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil" ) func TestBlockReturnsErr(t *testing.T) { diff --git a/package.json b/package.json index 4204a86b5..a1fddc475 100644 --- a/package.json +++ b/package.json @@ -593,6 +593,12 @@ "hash": "QmdcAXgEHUueP4A7b5hjabKn2EooeHgMreMvFC249dGCgc", "name": "go-ipfs-exchange-interface", "version": "0.0.1" + }, + { + "author": "hsanjuan", + "hash": "Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk", + "name": "go-ipfs-blocksutil", + "version": "0.0.1" } ], "gxVersion": "0.10.0",