From cc56389dbb5060f46b6af3b5d1bd5c81105d5415 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 8 Jan 2020 20:51:18 -0800 Subject: [PATCH] attempt to fix the DI loading, still not working --- node/modules/storageminer.go | 2 +- storage/miner.go | 4 ++-- storage/sectorblocks/blocks.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index b8e3f8a69..ccdff10cc 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -92,7 +92,7 @@ func SectorBuilderConfig(storagePath string, threads uint, noprecommit, nocommit } } -func StorageMiner(mctx helpers.MetricsCtx, lc fx.Lifecycle, api api.FullNode, h host.Host, ds dtypes.MetadataDS, sb *sectorbuilder.SectorBuilder, tktFn storage.TicketFn) (*storage.Miner, error) { +func StorageMiner(mctx helpers.MetricsCtx, lc fx.Lifecycle, api api.FullNode, h host.Host, ds dtypes.MetadataDS, sb storage.SectorBuilder, tktFn storage.TicketFn) (*storage.Miner, error) { maddr, err := minerAddrFromDS(ds) if err != nil { return nil, err diff --git a/storage/miner.go b/storage/miner.go index c7d44d885..4a35e1dd4 100644 --- a/storage/miner.go +++ b/storage/miner.go @@ -159,8 +159,8 @@ type SectorBuilderEpp struct { sb *sectorbuilder.SectorBuilder } -func NewElectionPoStProver(sb *sectorbuilder.SectorBuilder) *SectorBuilderEpp { - return &SectorBuilderEpp{sb} +func NewElectionPoStProver(sb SectorBuilder) *SectorBuilderEpp { + return &SectorBuilderEpp{sb.(*sectorbuilder.SectorBuilder)} } var _ gen.ElectionPoStProver = (*SectorBuilderEpp)(nil) diff --git a/storage/sectorblocks/blocks.go b/storage/sectorblocks/blocks.go index 9d12e0537..4b80d0fb6 100644 --- a/storage/sectorblocks/blocks.go +++ b/storage/sectorblocks/blocks.go @@ -47,10 +47,10 @@ type SectorBlocks struct { keyLk sync.Mutex } -func NewSectorBlocks(miner *storage.Miner, ds dtypes.MetadataDS, sb *sectorbuilder.SectorBuilder) *SectorBlocks { +func NewSectorBlocks(miner *storage.Miner, ds dtypes.MetadataDS, sb storage.SectorBuilder) *SectorBlocks { sbc := &SectorBlocks{ Miner: miner, - sb: sb, + sb: sb.(*sectorbuilder.SectorBuilder), intermediate: blockstore.NewBlockstore(namespace.Wrap(ds, imBlocksPrefix)),