Skip to content

Commit ad52b9e

Browse files
whyrusleepingwhyrusleeping
authored
Merge pull request #4912 from ipfs/extract/exchange1
Extract: exchange/interface.go, blocks/blocksutil, exchange/offline
2 parents 54a3556 + 8e63ddf commit ad52b9e

29 files changed

+42
-272
lines changed

‎blocks/blocksutil/block_generator.go

-35
This file was deleted.

‎blocks/blocksutil/block_generator_test.go

-19
This file was deleted.

‎blockservice/blockservice.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"fmt"
1010
"io"
1111

12-
exchange "github.com/ipfs/go-ipfs/exchange"
1312
"github.com/ipfs/go-ipfs/thirdparty/verifcid"
1413

1514
logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
1615
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
1716
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
17+
exchange "gx/ipfs/QmdcAXgEHUueP4A7b5hjabKn2EooeHgMreMvFC249dGCgc/go-ipfs-exchange-interface"
1818
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
1919
)
2020

‎blockservice/blockservice_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package blockservice
33
import (
44
"testing"
55

6-
butil "github.com/ipfs/go-ipfs/blocks/blocksutil"
7-
offline "github.com/ipfs/go-ipfs/exchange/offline"
8-
6+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
97
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
108
dssync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
119
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
1210
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
11+
butil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
1312
)
1413

1514
func TestWriteThroughWorks(t *testing.T) {

‎blockservice/test/blocks_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"time"
99

1010
. "github.com/ipfs/go-ipfs/blockservice"
11-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1211

1312
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
13+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
1414
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
1515
dssync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
1616
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"

‎core/builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"time"
1111

1212
bserv "github.com/ipfs/go-ipfs/blockservice"
13-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1413
filestore "github.com/ipfs/go-ipfs/filestore"
1514
dag "github.com/ipfs/go-ipfs/merkledag"
1615
resolver "github.com/ipfs/go-ipfs/path/resolver"
@@ -22,6 +21,7 @@ import (
2221

2322
metrics "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
2423
goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
24+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
2525
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
2626
retry "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/retrystore"
2727
dsync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"

‎core/commands/add.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
blockservice "github.com/ipfs/go-ipfs/blockservice"
1111
core "github.com/ipfs/go-ipfs/core"
1212
"github.com/ipfs/go-ipfs/core/coreunix"
13-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1413
dag "github.com/ipfs/go-ipfs/merkledag"
1514
dagtest "github.com/ipfs/go-ipfs/merkledag/test"
1615
mfs "github.com/ipfs/go-ipfs/mfs"
1716
ft "github.com/ipfs/go-ipfs/unixfs"
1817

18+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
1919
mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
2020
bstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
2121
cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"

‎core/commands/files.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1616
core "github.com/ipfs/go-ipfs/core"
1717
e "github.com/ipfs/go-ipfs/core/commands/e"
18-
"github.com/ipfs/go-ipfs/exchange/offline"
1918
dag "github.com/ipfs/go-ipfs/merkledag"
2019
mfs "github.com/ipfs/go-ipfs/mfs"
2120
path "github.com/ipfs/go-ipfs/path"
@@ -25,6 +24,7 @@ import (
2524

2625
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
2726
logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
27+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
2828
mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
2929
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
3030
cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"

‎core/commands/ls.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
cmds "github.com/ipfs/go-ipfs/commands"
1111
core "github.com/ipfs/go-ipfs/core"
1212
e "github.com/ipfs/go-ipfs/core/commands/e"
13-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1413
merkledag "github.com/ipfs/go-ipfs/merkledag"
1514
path "github.com/ipfs/go-ipfs/path"
1615
resolver "github.com/ipfs/go-ipfs/path/resolver"
1716
unixfs "github.com/ipfs/go-ipfs/unixfs"
1817
uio "github.com/ipfs/go-ipfs/unixfs/io"
1918
unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
2019

20+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
2121
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
2222
"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
2323
ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"

‎core/commands/pin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
core "github.com/ipfs/go-ipfs/core"
1313
e "github.com/ipfs/go-ipfs/core/commands/e"
1414
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
15-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1615
dag "github.com/ipfs/go-ipfs/merkledag"
1716
path "github.com/ipfs/go-ipfs/path"
1817
resolver "github.com/ipfs/go-ipfs/path/resolver"
@@ -21,6 +20,7 @@ import (
2120
uio "github.com/ipfs/go-ipfs/unixfs/io"
2221

2322
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
23+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
2424
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
2525
"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
2626
)

‎core/core.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
bserv "github.com/ipfs/go-ipfs/blockservice"
25-
exchange "github.com/ipfs/go-ipfs/exchange"
2625
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
2726
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
2827
rp "github.com/ipfs/go-ipfs/exchange/reprovide"
@@ -71,6 +70,7 @@ import (
7170
ifconnmgr "gx/ipfs/Qmax8X1Kfahf5WfSB68EWDG3d3qyS3Sqs1v412fjPTfRwx/go-libp2p-interface-connmgr"
7271
mplex "gx/ipfs/Qmc14vuKyGqX27RvBhekYytxSFJpaEgQVuVJgKSm69MEix/go-smux-multiplex"
7372
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
73+
exchange "gx/ipfs/QmdcAXgEHUueP4A7b5hjabKn2EooeHgMreMvFC249dGCgc/go-ipfs-exchange-interface"
7474
metrics "gx/ipfs/QmdeBtQGXjSt7cb97nx9JyLHHv5va2LyEAue7Q5tDFzpLy/go-libp2p-metrics"
7575
ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
7676
pnet "gx/ipfs/QmenK8PgcpM2KYzEKnGx1LyN1QXawswM2F6HktCbWKuC1b/go-libp2p-pnet"

‎core/coreapi/pin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
99
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
1010
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
11-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1211
merkledag "github.com/ipfs/go-ipfs/merkledag"
1312
pin "github.com/ipfs/go-ipfs/pin"
1413

14+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
1515
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1616
ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
1717
)

‎core/coreunix/add.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
bserv "github.com/ipfs/go-ipfs/blockservice"
1313
core "github.com/ipfs/go-ipfs/core"
14-
"github.com/ipfs/go-ipfs/exchange/offline"
1514
balanced "github.com/ipfs/go-ipfs/importer/balanced"
1615
ihelper "github.com/ipfs/go-ipfs/importer/helpers"
1716
trickle "github.com/ipfs/go-ipfs/importer/trickle"
@@ -21,6 +20,7 @@ import (
2120
unixfs "github.com/ipfs/go-ipfs/unixfs"
2221

2322
logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
23+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
2424
chunker "gx/ipfs/QmWo8jYc19ppG7YoTsrr2kEtLRbARTJho5oNXFTR6B7Peq/go-ipfs-chunker"
2525
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
2626
syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"

‎core/coreunix/metadata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
bserv "github.com/ipfs/go-ipfs/blockservice"
1010
core "github.com/ipfs/go-ipfs/core"
11-
offline "github.com/ipfs/go-ipfs/exchange/offline"
1211
importer "github.com/ipfs/go-ipfs/importer"
1312
merkledag "github.com/ipfs/go-ipfs/merkledag"
1413
ft "github.com/ipfs/go-ipfs/unixfs"
1514
uio "github.com/ipfs/go-ipfs/unixfs/io"
1615

1716
u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
17+
offline "gx/ipfs/QmWM5HhdG5ZQNyHQ5XhMdGmV9CvLpFynQfGpTxN2MEM7Lc/go-ipfs-exchange-offline"
1818
chunker "gx/ipfs/QmWo8jYc19ppG7YoTsrr2kEtLRbARTJho5oNXFTR6B7Peq/go-ipfs-chunker"
1919
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
2020
dssync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"

‎exchange/bitswap/bitswap.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"sync/atomic"
1111
"time"
1212

13-
exchange "github.com/ipfs/go-ipfs/exchange"
1413
decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
1514
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
1615
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
@@ -25,6 +24,7 @@ import (
2524
peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
2625
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
2726
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
27+
exchange "gx/ipfs/QmdcAXgEHUueP4A7b5hjabKn2EooeHgMreMvFC249dGCgc/go-ipfs-exchange-interface"
2828
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
2929
)
3030

‎exchange/bitswap/bitswap_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99
"time"
1010

11-
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
1211
decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
1312
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
1413

@@ -21,6 +20,7 @@ import (
2120
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
2221
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
2322
detectrace "gx/ipfs/Qmf7HqcW7LtCi1W8y2bdx2eJpze74jkbKqpByxgXikdbLF/go-detect-race"
23+
blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
2424
)
2525

2626
// FIXME the tests are really sensitive to the network delay. fix them to work

‎exchange/bitswap/notifications/notifications_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77
"time"
88

9-
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
109
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1110
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
11+
blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
1212
)
1313

1414
func TestDuplicates(t *testing.T) {

‎exchange/bitswap/session_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import (
66
"testing"
77
"time"
88

9-
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
10-
119
tu "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
1210
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
1311
blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
12+
blocksutil "gx/ipfs/Qmf951DP11mCoctpyF3ZppPZdo2oAxuNi2vnkVDgHJ8Fqk/go-ipfs-blocksutil"
1413
)
1514

1615
func TestBasicSessions(t *testing.T) {

‎exchange/interface.go

-38
This file was deleted.

0 commit comments

Comments
 (0)