cerc-io/ipfs-ethdb
10
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Abdul Rabbani 2022-05-27 10:50:56 -04:00
parent ea6b05e09f
commit 134b410b80
5 changed files with 660 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
batch.go
View File

@ -17,6 +17,7 @@
package ipfsethdb package ipfsethdb
import ( import (
"context"
"errors" "errors"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -103,7 +104,7 @@ func (b *Batch) Write() error {
} }
puts[i] = b puts[i] = b
} }
if err := b.blockService.AddBlocks(puts); err != nil { if err := b.blockService.AddBlocks(context.Background(), puts); err != nil {
return err return err
} }
for _, key := range b.deleteCache.Keys() { for _, key := range b.deleteCache.Keys() {
@ -112,7 +113,7 @@ func (b *Batch) Write() error {
if err != nil { if err != nil {
return err return err
} }
if err := b.blockService.DeleteBlock(c); err != nil { if err := b.blockService.DeleteBlock(context.Background(), c); err != nil {
return err return err
} }
} }

6
database.go
View File

@ -69,7 +69,7 @@ func (d *Database) Has(key []byte) (bool, error) {
if err != nil { if err != nil {
return false, err return false, err
} }
return d.blockService.Blockstore().Has(c) return d.blockService.Blockstore().Has(context.Background(), c)
} }
// Get satisfies the ethdb.KeyValueReader interface // Get satisfies the ethdb.KeyValueReader interface
@ -95,7 +95,7 @@ func (d *Database) Put(key []byte, value []byte) error {
if err != nil { if err != nil {
return err return err
} }
return d.blockService.AddBlock(b) return d.blockService.AddBlock(context.Background(), b)
} }
// Delete satisfies the ethdb.KeyValueWriter interface // Delete satisfies the ethdb.KeyValueWriter interface
@ -106,7 +106,7 @@ func (d *Database) Delete(key []byte) error {
if err != nil { if err != nil {
return err return err
} }
return d.blockService.DeleteBlock(c) return d.blockService.DeleteBlock(context.Background(), c)
} }
// DatabaseProperty enum type // DatabaseProperty enum type

30
go.mod
View File

@ -6,11 +6,11 @@ require (
github.com/ethereum/go-ethereum v1.10.18 github.com/ethereum/go-ethereum v1.10.18
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
github.com/ipfs/go-block-format v0.0.3 github.com/ipfs/go-block-format v0.0.3
github.com/ipfs/go-blockservice v0.1.3 github.com/ipfs/go-blockservice v0.3.0
github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-cid v0.2.0
github.com/ipfs/go-ipfs-blockstore v1.0.1 github.com/ipfs/go-ipfs-blockstore v1.2.0
github.com/ipfs/go-ipfs-ds-help v1.0.0 github.com/ipfs/go-ipfs-ds-help v1.1.0
github.com/ipfs/go-ipfs-exchange-interface v0.0.1 github.com/ipfs/go-ipfs-exchange-interface v0.1.0
github.com/jmoiron/sqlx v1.3.5 github.com/jmoiron/sqlx v1.3.5
github.com/lib/pq v1.10.5 github.com/lib/pq v1.10.5
github.com/mailgun/groupcache/v2 v2.3.0 github.com/mailgun/groupcache/v2 v2.3.0
@ -23,20 +23,21 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gogo/protobuf v1.3.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.2.0 // indirect github.com/google/uuid v1.2.0 // indirect
github.com/ipfs/bbloom v0.0.4 // indirect github.com/ipfs/bbloom v0.0.4 // indirect
github.com/ipfs/go-datastore v0.4.4 // indirect github.com/ipfs/go-datastore v0.5.0 // indirect
github.com/ipfs/go-ipfs-util v0.0.2 // indirect github.com/ipfs/go-ipfs-util v0.0.2 // indirect
github.com/ipfs/go-log v0.0.1 // indirect github.com/ipfs/go-ipld-format v0.3.0 // indirect
github.com/ipfs/go-log v1.0.5 // indirect
github.com/ipfs/go-log/v2 v2.3.0 // indirect
github.com/ipfs/go-metrics-interface v0.0.1 // indirect github.com/ipfs/go-metrics-interface v0.0.1 // indirect
github.com/ipfs/go-verifcid v0.0.1 // indirect github.com/ipfs/go-verifcid v0.0.1 // indirect
github.com/jbenet/goprocess v0.1.3 // indirect github.com/jbenet/goprocess v0.1.4 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect github.com/mr-tron/base58 v1.2.0 // indirect
@ -45,12 +46,13 @@ require (
github.com/multiformats/go-multibase v0.0.3 // indirect github.com/multiformats/go-multibase v0.0.3 // indirect
github.com/multiformats/go-varint v0.0.6 // indirect github.com/multiformats/go-varint v0.0.6 // indirect
github.com/nxadm/tail v1.4.8 // indirect github.com/nxadm/tail v1.4.8 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/segmentio/fasthash v1.0.3 // indirect github.com/segmentio/fasthash v1.0.3 // indirect
github.com/sirupsen/logrus v1.6.0 // indirect github.com/sirupsen/logrus v1.6.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect go.uber.org/atomic v1.7.0 // indirect
go.uber.org/atomic v1.6.0 // indirect go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect

674
go.sum
View File

File diff suppressed because it is too large Load Diff

28
mock_blockservice.go
View File

@ -52,27 +52,27 @@ func (mbs *MockBlockservice) Exchange() exchange.Interface {
panic("Exchange: implement me") panic("Exchange: implement me")
} }
func (mbs *MockBlockservice) AddBlock(b blocks.Block) error { func (mbs *MockBlockservice) AddBlock(ctx context.Context, b blocks.Block) error {
return mbs.blockStore.Put(b) return mbs.blockStore.Put(ctx, b)
} }
func (mbs *MockBlockservice) AddBlocks(bs []blocks.Block) error { func (mbs *MockBlockservice) AddBlocks(ctx context.Context, bs []blocks.Block) error {
return mbs.blockStore.PutMany(bs) return mbs.blockStore.PutMany(ctx, bs)
} }
func (mbs *MockBlockservice) DeleteBlock(c cid.Cid) error { func (mbs *MockBlockservice) DeleteBlock(ctx context.Context, c cid.Cid) error {
return mbs.blockStore.DeleteBlock(c) return mbs.blockStore.DeleteBlock(ctx, c)
} }
func (mbs *MockBlockservice) GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, error) { func (mbs *MockBlockservice) GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, error) {
return mbs.blockStore.Get(c) return mbs.blockStore.Get(ctx, c)
} }
func (mbs *MockBlockservice) GetBlocks(ctx context.Context, cs []cid.Cid) <-chan blocks.Block { func (mbs *MockBlockservice) GetBlocks(ctx context.Context, cs []cid.Cid) <-chan blocks.Block {
blockChan := make(chan blocks.Block) blockChan := make(chan blocks.Block)
go func() { go func() {
for _, c := range cs { for _, c := range cs {
if b, err := mbs.blockStore.Get(c); err == nil { if b, err := mbs.blockStore.Get(ctx, c); err == nil {
blockChan <- b blockChan <- b
} }
} }
@ -93,17 +93,17 @@ type MockBlockstore struct {
err error err error
} }
func (mbs *MockBlockstore) DeleteBlock(c cid.Cid) error { func (mbs *MockBlockstore) DeleteBlock(ctx context.Context, c cid.Cid) error {
delete(mbs.blocks, c.String()) delete(mbs.blocks, c.String())
return mbs.err return mbs.err
} }
func (mbs *MockBlockstore) Has(c cid.Cid) (bool, error) { func (mbs *MockBlockstore) Has(ctx context.Context, c cid.Cid) (bool, error) {
_, ok := mbs.blocks[c.String()] _, ok := mbs.blocks[c.String()]
return ok, mbs.err return ok, mbs.err
} }
func (mbs *MockBlockstore) Get(c cid.Cid) (blocks.Block, error) { func (mbs *MockBlockstore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
obj, ok := mbs.blocks[c.String()] obj, ok := mbs.blocks[c.String()]
if !ok { if !ok {
return nil, blockNotFoundErr return nil, blockNotFoundErr
@ -111,7 +111,7 @@ func (mbs *MockBlockstore) Get(c cid.Cid) (blocks.Block, error) {
return obj, mbs.err return obj, mbs.err
} }
func (mbs *MockBlockstore) GetSize(c cid.Cid) (int, error) { func (mbs *MockBlockstore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
obj, ok := mbs.blocks[c.String()] obj, ok := mbs.blocks[c.String()]
if !ok { if !ok {
return 0, blockNotFoundErr return 0, blockNotFoundErr
@ -119,12 +119,12 @@ func (mbs *MockBlockstore) GetSize(c cid.Cid) (int, error) {
return len(obj.RawData()), mbs.err return len(obj.RawData()), mbs.err
} }
func (mbs *MockBlockstore) Put(b blocks.Block) error { func (mbs *MockBlockstore) Put(ctx context.Context, b blocks.Block) error {
mbs.blocks[b.Cid().String()] = b mbs.blocks[b.Cid().String()] = b
return mbs.err return mbs.err
} }
func (mbs *MockBlockstore) PutMany(bs []blocks.Block) error { func (mbs *MockBlockstore) PutMany(ctx context.Context, bs []blocks.Block) error {
for _, b := range bs { for _, b := range bs {
mbs.blocks[b.Cid().String()] = b mbs.blocks[b.Cid().String()] = b
} }