cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Stop referring to github.com/ipfs/go-ipfs-blockstore outside of lib

Browse Source
This commit is contained in:
Peter Rabbitson 2020-11-01 21:58:01 +01:00
parent a389622ac6
commit 7be7a9b5e3
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/en/architecture/architecture.md
View File

@ -311,7 +311,7 @@ FIXME: Maybe mention the `Batching` interface as the developer will stumble upon
FIXME: IPFS blocks vs Filecoin blocks ideally happens before this / here FIXME: IPFS blocks vs Filecoin blocks ideally happens before this / here
The [`Blockstore` interface](`github.com/ipfs/go-ipfs-blockstore/blockstore.go`) structures the key-value pair The [`Blockstore` interface](`github.com/filecoin-project/lotus/lib/blockstore.go`) structures the key-value pair
into the CID format for the key and the [`Block` interface](`github.com/ipfs/go-block-format/blocks.go`) for the value. into the CID format for the key and the [`Block` interface](`github.com/ipfs/go-block-format/blocks.go`) for the value.
The `Block` value is just a raw string of bytes addressed by its hash, which is included in the CID key. The `Block` value is just a raw string of bytes addressed by its hash, which is included in the CID key.

7
lib/blockstore/memstore.go
View File

@ -5,7 +5,6 @@ import (
blocks "github.com/ipfs/go-block-format" blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
blockstore "github.com/ipfs/go-ipfs-blockstore"
) )
// MemStore is a terminal blockstore that keeps blocks in memory. // MemStore is a terminal blockstore that keeps blocks in memory.
@ -24,7 +23,7 @@ func (m MemStore) Has(k cid.Cid) (bool, error) {
func (m MemStore) View(k cid.Cid, callback func([]byte) error) error { func (m MemStore) View(k cid.Cid, callback func([]byte) error) error {
b, ok := m[k] b, ok := m[k]
if !ok { if !ok {
return blockstore.ErrNotFound return ErrNotFound
} }
return callback(b.RawData()) return callback(b.RawData())
} }
@ -32,7 +31,7 @@ func (m MemStore) View(k cid.Cid, callback func([]byte) error) error {
func (m MemStore) Get(k cid.Cid) (blocks.Block, error) { func (m MemStore) Get(k cid.Cid) (blocks.Block, error) {
b, ok := m[k] b, ok := m[k]
if !ok { if !ok {
return nil, blockstore.ErrNotFound return nil, ErrNotFound
} }
return b, nil return b, nil
} }
@ -41,7 +40,7 @@ func (m MemStore) Get(k cid.Cid) (blocks.Block, error) {
func (m MemStore) GetSize(k cid.Cid) (int, error) { func (m MemStore) GetSize(k cid.Cid) (int, error) {
b, ok := m[k] b, ok := m[k]
if !ok { if !ok {
return 0, blockstore.ErrNotFound return 0, ErrNotFound
} }
return len(b.RawData()), nil return len(b.RawData()), nil
} }

2
node/repo/fsrepo.go
View File

@ -12,9 +12,9 @@ import (
"sync" "sync"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/filecoin-project/lotus/lib/blockstore"
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"
fslock "github.com/ipfs/go-fs-lock" fslock "github.com/ipfs/go-fs-lock"
blockstore "github.com/ipfs/go-ipfs-blockstore"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/multiformats/go-base32" "github.com/multiformats/go-base32"

2
node/repo/interface.go
View File

@ -3,8 +3,8 @@ package repo
import ( import (
"errors" "errors"
"github.com/filecoin-project/lotus/lib/blockstore"
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"
blockstore "github.com/ipfs/go-ipfs-blockstore"
"github.com/multiformats/go-multiaddr" "github.com/multiformats/go-multiaddr"
"github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"

2
node/repo/retrievalstoremgr/retrievalstoremgr_test.go
View File

@ -9,13 +9,13 @@ import (
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"
"github.com/ipfs/go-datastore/query" "github.com/ipfs/go-datastore/query"
dss "github.com/ipfs/go-datastore/sync" dss "github.com/ipfs/go-datastore/sync"
blockstore "github.com/ipfs/go-ipfs-blockstore"
format "github.com/ipfs/go-ipld-format" format "github.com/ipfs/go-ipld-format"
dag "github.com/ipfs/go-merkledag" dag "github.com/ipfs/go-merkledag"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/filecoin-project/go-multistore" "github.com/filecoin-project/go-multistore"
"github.com/filecoin-project/lotus/lib/blockstore"
"github.com/filecoin-project/lotus/node/repo/importmgr" "github.com/filecoin-project/lotus/node/repo/importmgr"
"github.com/filecoin-project/lotus/node/repo/retrievalstoremgr" "github.com/filecoin-project/lotus/node/repo/retrievalstoremgr"
) )