From 0fc2f3a26fe1af71d6631c1455ae9c8c7e500231 Mon Sep 17 00:00:00 2001 From: vyzo Date: Mon, 1 Mar 2021 09:25:52 +0200 Subject: [PATCH] fix post-rebase compilation errors --- chain/store/splitstore/splitstore.go | 2 +- node/modules/blockstore.go | 10 +++++----- node/repo/interface.go | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/chain/store/splitstore/splitstore.go b/chain/store/splitstore/splitstore.go index e20615e68..db35357ba 100644 --- a/chain/store/splitstore/splitstore.go +++ b/chain/store/splitstore/splitstore.go @@ -16,10 +16,10 @@ import ( logging "github.com/ipfs/go-log/v2" "github.com/filecoin-project/go-state-types/abi" + bstore "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" - bstore "github.com/filecoin-project/lotus/lib/blockstore" ) // these are variable so that 1) lotus-soup builds 2) we can change them in tests diff --git a/node/modules/blockstore.go b/node/modules/blockstore.go index ae4f7a188..7d8e713ba 100644 --- a/node/modules/blockstore.go +++ b/node/modules/blockstore.go @@ -8,7 +8,7 @@ import ( "time" lmdbbs "github.com/filecoin-project/go-bs-lmdb" - badgerbs "github.com/filecoin-project/lotus/lib/blockstore/badger" + badgerbs "github.com/filecoin-project/lotus/blockstore/badger" bstore "github.com/ipfs/go-ipfs-blockstore" "go.uber.org/fx" "golang.org/x/xerrors" @@ -96,8 +96,8 @@ func BadgerHotBlockstore(lc fx.Lifecycle, r repo.LockedRepo) (dtypes.HotBlocksto return hot, err } -func SplitBlockstore(cfg *config.Blockstore) func(lc fx.Lifecycle, r repo.LockedRepo, ds dtypes.MetadataDS, cold dtypes.ColdBlockstore, hot dtypes.HotBlockstore) (dtypes.SplitBlockstore, error) { - return func(lc fx.Lifecycle, r repo.LockedRepo, ds dtypes.MetadataDS, cold dtypes.ColdBlockstore, hot dtypes.HotBlockstore) (dtypes.SplitBlockstore, error) { +func SplitBlockstore(cfg *config.Blockstore) func(lc fx.Lifecycle, r repo.LockedRepo, ds dtypes.MetadataDS, cold dtypes.UniversalBlockstore, hot dtypes.HotBlockstore) (dtypes.SplitBlockstore, error) { + return func(lc fx.Lifecycle, r repo.LockedRepo, ds dtypes.MetadataDS, cold dtypes.UniversalBlockstore, hot dtypes.HotBlockstore) (dtypes.SplitBlockstore, error) { path, err := r.SplitstorePath() if err != nil { return nil, err @@ -124,7 +124,7 @@ func SplitBlockstore(cfg *config.Blockstore) func(lc fx.Lifecycle, r repo.Locked } } -func StateFlatBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, bs dtypes.ColdBlockstore) (dtypes.StateBlockstore, error) { +func StateFlatBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, bs dtypes.UniversalBlockstore) (dtypes.StateBlockstore, error) { return bs, nil } @@ -132,7 +132,7 @@ func StateSplitBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, bs dtypes.Sp return bs, nil } -func ChainFlatBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, bs dtypes.ColdBlockstore) (dtypes.ChainBlockstore, error) { +func ChainFlatBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, bs dtypes.UniversalBlockstore) (dtypes.ChainBlockstore, error) { return bs, nil } diff --git a/node/repo/interface.go b/node/repo/interface.go index d4afbe2a0..b169ee5cc 100644 --- a/node/repo/interface.go +++ b/node/repo/interface.go @@ -67,9 +67,6 @@ type LockedRepo interface { // SplitstorePath returns the path for the SplitStore SplitstorePath() (string, error) - // SplitstorePath returns the path for the SplitStore - SplitstorePath() (string, error) - // Returns config in this repo Config() (interface{}, error) SetConfig(func(interface{})) error