Skip to content

Commit 2a84e38

Browse files
committed
[Access] Update ipfs libraries to the new boxo version
1 parent 576ed8b commit 2a84e38

File tree

20 files changed

+32
-1444
lines changed

20 files changed

+32
-1444
lines changed

Diff for: engine/execution/computation/computer/computer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/onflow/cadence/runtime/sema"
1616
"github.com/onflow/cadence/runtime/stdlib"
1717

18+
"github.com/ipfs/boxo/blockstore"
1819
"github.com/ipfs/go-datastore"
1920
dssync "github.com/ipfs/go-datastore/sync"
20-
blockstore "github.com/ipfs/go-ipfs-blockstore"
2121
"github.com/rs/zerolog"
2222
"github.com/stretchr/testify/assert"
2323
"github.com/stretchr/testify/mock"

Diff for: engine/execution/computation/execution_verification_test.go

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

9+
"github.com/ipfs/boxo/blockstore"
910
"github.com/ipfs/go-datastore"
1011
dssync "github.com/ipfs/go-datastore/sync"
11-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1212
"github.com/onflow/cadence"
1313
jsoncdc "github.com/onflow/cadence/encoding/json"
1414
"github.com/rs/zerolog"

Diff for: engine/execution/computation/manager_benchmark_test.go

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

10+
blockstore "github.com/ipfs/boxo/blockstore"
1011
"github.com/ipfs/go-datastore"
1112
dssync "github.com/ipfs/go-datastore/sync"
12-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1313
"github.com/onflow/cadence/runtime"
1414
"github.com/rs/zerolog"
1515
"github.com/stretchr/testify/mock"

Diff for: engine/execution/computation/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"testing"
1010
"time"
1111

12+
"github.com/ipfs/boxo/blockstore"
1213
"github.com/ipfs/go-datastore"
1314
dssync "github.com/ipfs/go-datastore/sync"
14-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1515
"github.com/onflow/cadence"
1616
jsoncdc "github.com/onflow/cadence/encoding/json"
1717
"github.com/onflow/cadence/runtime/common"

Diff for: engine/execution/computation/programs_test.go

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

9+
"github.com/ipfs/boxo/blockstore"
910
"github.com/ipfs/go-datastore"
1011
dssync "github.com/ipfs/go-datastore/sync"
11-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1212
"github.com/onflow/cadence"
1313
"github.com/onflow/cadence/encoding/ccf"
1414
"github.com/rs/zerolog"

Diff for: engine/testutil/nodes.go

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

1111
"github.com/coreos/go-semver/semver"
12+
"github.com/ipfs/boxo/blockstore"
1213
"github.com/ipfs/go-datastore"
1314
dssync "github.com/ipfs/go-datastore/sync"
14-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1515
"github.com/rs/zerolog"
1616
"github.com/stretchr/testify/mock"
1717
"github.com/stretchr/testify/require"

Diff for: engine/verification/utils/unittest/fixture.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"math/rand"
66
"testing"
77

8+
"github.com/ipfs/boxo/blockstore"
89
"github.com/ipfs/go-datastore"
910
dssync "github.com/ipfs/go-datastore/sync"
10-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1111
"github.com/rs/zerolog"
1212
"github.com/stretchr/testify/mock"
1313
"github.com/stretchr/testify/require"

Diff for: fvm/fvm_bench_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strings"
1111
"testing"
1212

13+
"github.com/ipfs/boxo/blockstore"
1314
"github.com/ipfs/go-datastore"
1415
dssync "github.com/ipfs/go-datastore/sync"
15-
blockstore "github.com/ipfs/go-ipfs-blockstore"
1616
"github.com/onflow/atree"
1717
"github.com/onflow/cadence"
1818
"github.com/onflow/cadence/encoding/ccf"
@@ -24,6 +24,7 @@ import (
2424

2525
flow2 "github.com/onflow/flow-go-sdk"
2626
"github.com/onflow/flow-go-sdk/templates"
27+
2728
"github.com/onflow/flow-go/engine/execution"
2829
"github.com/onflow/flow-go/engine/execution/computation"
2930
"github.com/onflow/flow-go/engine/execution/computation/committer"

Diff for: go.mod

-10
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ require (
3232
github.com/hashicorp/golang-lru v1.0.2
3333
github.com/improbable-eng/grpc-web v0.15.0
3434
github.com/ipfs/go-block-format v0.2.0
35-
github.com/ipfs/go-blockservice v0.4.0
3635
github.com/ipfs/go-cid v0.4.1
3736
github.com/ipfs/go-datastore v0.6.0
3837
github.com/ipfs/go-ds-badger2 v0.1.3
39-
github.com/ipfs/go-ipfs-blockstore v1.3.0
40-
github.com/ipfs/go-ipfs-provider v0.7.0
4138
github.com/ipfs/go-ipld-format v0.6.0
4239
github.com/ipfs/go-log v1.0.5
4340
github.com/ipfs/go-log/v2 v2.5.1
@@ -142,7 +139,6 @@ require (
142139
github.com/beorn7/perks v1.0.1 // indirect
143140
github.com/bits-and-blooms/bitset v1.10.0 // indirect
144141
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
145-
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
146142
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
147143
github.com/cespare/xxhash v1.1.0 // indirect
148144
github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -198,17 +194,12 @@ require (
198194
github.com/huin/goupnp v1.3.0 // indirect
199195
github.com/inconshreveable/mousetrap v1.1.0 // indirect
200196
github.com/ipfs/bbloom v0.0.4 // indirect
201-
github.com/ipfs/go-bitswap v0.9.0 // indirect
202197
github.com/ipfs/go-cidutil v0.1.0 // indirect
203-
github.com/ipfs/go-fetcher v1.5.0 // indirect
204198
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
205-
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
206-
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
207199
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
208200
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
209201
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
210202
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
211-
github.com/ipfs/go-verifcid v0.0.1 // indirect
212203
github.com/ipld/go-ipld-prime v0.21.0 // indirect
213204
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
214205
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
@@ -226,7 +217,6 @@ require (
226217
github.com/libp2p/go-cidranger v1.1.0 // indirect
227218
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
228219
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
229-
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
230220
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
231221
github.com/libp2p/go-libp2p-routing-helpers v0.7.3 // indirect
232222
github.com/libp2p/go-msgio v0.3.0 // indirect

0 commit comments

Comments
 (0)