diff --git a/lib/blockstore/blockstore.go b/lib/blockstore/blockstore.go index a1293a83c..eb28f1bf0 100644 --- a/lib/blockstore/blockstore.go +++ b/lib/blockstore/blockstore.go @@ -45,12 +45,8 @@ func NewBlockstore(dstore ds.Batching) blockstore.Blockstore { // Alias so other packages don't have to import go-ipfs-blockstore type Blockstore = blockstore.Blockstore type Viewer = blockstore.Viewer -type GCBlockstore = blockstore.GCBlockstore type CacheOpts = blockstore.CacheOpts -type GCLocker = blockstore.GCLocker -var NewGCLocker = blockstore.NewGCLocker -var NewGCBlockstore = blockstore.NewGCBlockstore var ErrNotFound = blockstore.ErrNotFound func DefaultCacheOpts() CacheOpts { diff --git a/node/builder.go b/node/builder.go index 2207083c0..5ae7b8fea 100644 --- a/node/builder.go +++ b/node/builder.go @@ -55,7 +55,6 @@ import ( "github.com/filecoin-project/lotus/extern/sector-storage/storiface" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/journal" - "github.com/filecoin-project/lotus/lib/blockstore" "github.com/filecoin-project/lotus/lib/peermgr" _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" @@ -264,8 +263,6 @@ func Online() Option { Override(new(api.WalletAPI), From(new(wallet.MultiWallet))), Override(new(*messagesigner.MessageSigner), messagesigner.NewMessageSigner), - Override(new(dtypes.ChainGCLocker), blockstore.NewGCLocker), - Override(new(dtypes.ChainGCBlockstore), modules.ChainGCBlockstore), Override(new(dtypes.ChainBitswap), modules.ChainBitswap), Override(new(dtypes.ChainBlockService), modules.ChainBlockService), diff --git a/node/modules/chain.go b/node/modules/chain.go index 8c7606ee3..fe0ebdfbb 100644 --- a/node/modules/chain.go +++ b/node/modules/chain.go @@ -38,7 +38,7 @@ import ( "github.com/filecoin-project/lotus/node/repo" ) -func ChainBitswap(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.Routing, bs dtypes.ChainGCBlockstore) dtypes.ChainBitswap { +func ChainBitswap(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.Routing, bs dtypes.ChainBlockstore) dtypes.ChainBitswap { // prefix protocol for chain bitswap // (so bitswap uses /chain/ipfs/bitswap/1.0.0 internally for chain sync stuff) bitswapNetwork := network.NewFromIpfsHost(host, rt, network.Prefix("/chain")) @@ -91,10 +91,6 @@ func ChainRawBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, r repo.LockedR return cbs, nil } -func ChainGCBlockstore(bs dtypes.ChainRawBlockstore, gcl dtypes.ChainGCLocker) dtypes.ChainGCBlockstore { - return blockstore.NewGCBlockstore(bs, gcl) -} - func ChainBlockService(bs dtypes.ChainRawBlockstore, rem dtypes.ChainBitswap) dtypes.ChainBlockService { return blockservice.New(bs, rem) } diff --git a/node/modules/dtypes/storage.go b/node/modules/dtypes/storage.go index 9d7364577..05b830920 100644 --- a/node/modules/dtypes/storage.go +++ b/node/modules/dtypes/storage.go @@ -26,8 +26,6 @@ type MetadataDS datastore.Batching type ChainRawBlockstore blockstore.Blockstore type ChainBlockstore blockstore.Blockstore // optionally bitswap backed -type ChainGCLocker blockstore.GCLocker -type ChainGCBlockstore blockstore.GCBlockstore type ChainBitswap exchange.Interface type ChainBlockService bserv.BlockService