Skip to content

Commit

Permalink
chore: migrate to boxo
Browse files Browse the repository at this point in the history 
This migrates everything except the `go-car` librairy: ipfs/boxo#218 (comment)
  • Loading branch information
@Jorropo @dirkmc
Jorropo authored and dirkmc committed Jun 7, 2023
1 parent ea9391a commit d74e9c1
Show file tree
Hide file tree
Showing 28 changed files with 119 additions and 95 deletions.
2 changes: 1 addition & 1 deletion discovery/impl/local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"context"

"github.com/hannahhoward/go-pubsub"
dshelp "github.com/ipfs/boxo/datastore/dshelp"
"github.com/ipfs/go-cid"
"github.com/ipfs/go-datastore"
dshelp "github.com/ipfs/go-ipfs-ds-help"
logging "github.com/ipfs/go-log/v2"

cborutil "github.com/filecoin-project/go-cbor-util"
Expand Down
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Submodule filecoin-ffi updated 73 files
+55 −97 .circleci/config.yml
+4 −4 Makefile
+10 −78 README.md
+0 −9 SECURITY.md
+74 −49 bls.go
+14 −14 bls_test.go
+3 −4 build.sh
+0 −157 cgo/blockstore.go
+0 −61 cgo/bls.go
+0 −60 cgo/const.go
+0 −25 cgo/errors.go
+0 −150 cgo/extern.go
+0 −92 cgo/fvm.go
+0 −275 cgo/helpers.go
+0 −66 cgo/helpers_test.go
+0 −39 cgo/interface.go
+0 −9 cgo/libs.go
+0 −383 cgo/proofs.go
+0 −49 cgo/registry.go
+0 −676 cgo/types.go
+0 −20 cgo/util.go
+1 −2 cgoleakdetect/runner.go
+0 −219 distributed.go
+37 −0 filcrypto.yml
+0 −240 fvm.go
+0 −36 fvm_test.go
+3,531 −0 generated/cgo_helpers.go
+9 −0 generated/cgo_helpers.h
+53 −0 generated/const.go
+54 −0 generated/customallocs.go
+809 −0 generated/generated.go
+321 −0 generated/types.go
+9 −48 go.mod
+58 −163 go.sum
+0 −9 headerstubs/stdbool.h
+0 −1 headerstubs/stddef.h
+2 −5 headerstubs/stdint.h
+13 −80 install-filcrypto
+1 −71 parameters.json
+389 −413 proofs.go
+22 −19 proofs_test.go
+1,594 −2,430 rust/Cargo.lock
+19 −41 rust/Cargo.toml
+11 −0 rust/build.rs
+23 −0 rust/cbindgen.toml
+1 −1 rust/rust-toolchain
+2 −31 rust/scripts/build-release.sh
+1 −1 rust/scripts/publish-release.sh
+280 −195 rust/src/bls/api.rs
+1 −0 rust/src/bls/mod.rs
+67 −0 rust/src/bls/types.rs
+0 −151 rust/src/fvm/blockstore/cgo.rs
+0 −2 rust/src/fvm/blockstore/mod.rs
+0 −26 rust/src/fvm/cgo/error.rs
+0 −67 rust/src/fvm/cgo/externs.rs
+0 −5 rust/src/fvm/cgo/mod.rs
+0 −485 rust/src/fvm/engine.rs
+0 −210 rust/src/fvm/externs.rs
+0 −554 rust/src/fvm/machine.rs
+0 −9 rust/src/fvm/mod.rs
+0 −46 rust/src/fvm/types.rs
+0 −21 rust/src/lib.rs
+1,398 −2,567 rust/src/proofs/api.rs
+61 −29 rust/src/proofs/helpers.rs
+427 −319 rust/src/proofs/types.rs
+79 −69 rust/src/util/api.rs
+33 −229 rust/src/util/types.rs
+0 −350 sector_update.go
+0 −7 srs-inner-product.json
+7 −0 tools.go
+12 −33 types.go
+0 −6 version.go
+7 −16 workflows.go
43 changes: 27 additions & 16 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,19 @@ require (
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e
github.com/hashicorp/go-multierror v1.1.1
github.com/ipfs/go-block-format v0.1.1
github.com/ipfs/go-blockservice v0.5.0
github.com/ipfs/boxo v0.8.2-0.20230530204310-0dcbaccc3745
github.com/ipfs/go-block-format v0.1.2
github.com/ipfs/go-cid v0.4.1
github.com/ipfs/go-cidutil v0.1.0
github.com/ipfs/go-datastore v0.6.0
github.com/ipfs/go-filestore v1.2.0
github.com/ipfs/go-ipfs-blockstore v1.3.0
github.com/ipfs/go-graphsync v0.14.5
github.com/ipfs/go-ipfs-blocksutil v0.0.1
github.com/ipfs/go-ipfs-chunker v0.0.5
github.com/ipfs/go-ipfs-ds-help v1.1.0
github.com/ipfs/go-ipfs-exchange-offline v0.3.0
github.com/ipfs/go-ipfs-files v0.3.0
github.com/ipfs/go-ipld-cbor v0.0.6
github.com/ipfs/go-ipld-format v0.4.0
github.com/ipfs/go-ipld-format v0.4.1-0.20230530195241-c3da01c74a06
github.com/ipfs/go-log/v2 v2.5.1
github.com/ipfs/go-merkledag v0.10.0
github.com/ipfs/go-unixfs v0.4.4
github.com/ipld/go-car v0.5.0
github.com/ipld/go-car/v2 v2.8.2
github.com/ipld/go-car/v2 v2.9.1-0.20230325062757-fff0e4397a3d
github.com/ipld/go-codec-dagpb v1.6.0
github.com/ipld/go-ipld-prime v0.20.0
github.com/ipni/go-libipni v0.0.7
Expand Down Expand Up @@ -72,7 +66,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/filecoin-project/filecoin-ffi v0.30.4-0.20200910194244-f640612a1a1f // indirect
github.com/filecoin-project/filecoin-ffi v0.30.4-0.20220519234331-bfd1f5f9fe38 // indirect
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 // indirect
github.com/filecoin-project/go-amt-ipld/v4 v4.0.0 // indirect
github.com/filecoin-project/go-bitfield v0.2.4 // indirect
Expand All @@ -94,15 +88,22 @@ require (
github.com/huin/goupnp v1.1.0 // indirect
github.com/ipfs/bbloom v0.0.4 // indirect
github.com/ipfs/go-bitfield v1.1.0 // indirect
github.com/ipfs/go-blockservice v0.5.0 // indirect
github.com/ipfs/go-ipfs-blockstore v1.3.0 // indirect
github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
github.com/ipfs/go-ipfs-exchange-offline v0.3.0 // indirect
github.com/ipfs/go-ipfs-files v0.3.0 // indirect
github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
github.com/ipfs/go-ipld-legacy v0.1.2-0.20230530145437-25f06f837f87 // indirect
github.com/ipfs/go-libipfs v0.6.1 // indirect
github.com/ipfs/go-log v1.0.5 // indirect
github.com/ipfs/go-merkledag v0.10.1-0.20230601163447-eceea556e7d4 // indirect
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
github.com/ipfs/go-unixfs v0.4.5 // indirect
github.com/ipfs/go-unixfsnode v1.6.0 // indirect
github.com/ipfs/go-verifcid v0.0.2 // indirect
github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0 // indirect
Expand Down Expand Up @@ -142,17 +143,21 @@ require (
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/quic-go/quic-go v0.33.0 // indirect
github.com/quic-go/webtransport-go v0.5.2 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/tj/go-spin v1.1.0 // indirect
github.com/twmb/murmur3 v1.1.6 // indirect
github.com/urfave/cli/v2 v2.16.3 // indirect
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
github.com/xlab/c-for-go v0.0.0-20200718154222-87b0065af829 // indirect
github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 // indirect
github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opentelemetry.io/otel v1.13.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.13.0 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
Expand All @@ -163,8 +168,14 @@ require (
golang.org/x/text v0.8.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
modernc.org/cc v1.0.0 // indirect
modernc.org/golex v1.0.0 // indirect
modernc.org/mathutil v1.1.1 // indirect
modernc.org/strutil v1.1.0 // indirect
modernc.org/xc v1.0.0 // indirect
)

replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi
Loading

0 comments on commit d74e9c1

Please sign in to comment.