diff --git a/chain/deals/client_states.go b/chain/deals/client_states.go index 26ac0ce68..678305c95 100644 --- a/chain/deals/client_states.go +++ b/chain/deals/client_states.go @@ -4,15 +4,14 @@ import ( "bytes" "context" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/lib/cborutil" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborutil" ) type clientHandlerFunc func(ctx context.Context, deal ClientDeal) (func(*ClientDeal), error) diff --git a/chain/events/events_height.go b/chain/events/events_height.go index 3c03f7571..524efd0d5 100644 --- a/chain/events/events_height.go +++ b/chain/events/events_height.go @@ -2,9 +2,10 @@ package events import ( "context" - "go.opencensus.io/trace" "sync" + "go.opencensus.io/trace" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/market/fundmgr.go b/chain/market/fundmgr.go index 05716a428..9f8068ae2 100644 --- a/chain/market/fundmgr.go +++ b/chain/market/fundmgr.go @@ -52,6 +52,7 @@ func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr address.Address, am avail = types.NewInt(0) } fm.available[addr] = avail + fm.lk.Unlock() smsg, err := fm.mpool.MpoolPushMessage(ctx, &types.Message{ diff --git a/cmd/lotus-storage-miner/sectors.go b/cmd/lotus-storage-miner/sectors.go index b9075e443..627e11c14 100644 --- a/cmd/lotus-storage-miner/sectors.go +++ b/cmd/lotus-storage-miner/sectors.go @@ -2,11 +2,11 @@ package main import ( "fmt" - "github.com/filecoin-project/lotus/api" "strconv" "gopkg.in/urfave/cli.v2" + "github.com/filecoin-project/lotus/api" lcli "github.com/filecoin-project/lotus/cli" ) diff --git a/node/builder.go b/node/builder.go index 147366db8..0956a67c1 100644 --- a/node/builder.go +++ b/node/builder.go @@ -3,7 +3,6 @@ package node import ( "context" "errors" - "github.com/filecoin-project/lotus/chain/market" "time" blockstore "github.com/ipfs/go-ipfs-blockstore" @@ -21,6 +20,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain" "github.com/filecoin-project/lotus/chain/deals" + "github.com/filecoin-project/lotus/chain/market" "github.com/filecoin-project/lotus/chain/metrics" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/node/impl/full.go b/node/impl/full.go index 6ce7fa91e..76cdc5de4 100644 --- a/node/impl/full.go +++ b/node/impl/full.go @@ -2,13 +2,13 @@ package impl import ( "context" - "github.com/filecoin-project/lotus/node/impl/market" - - "github.com/filecoin-project/lotus/node/impl/client" - "github.com/filecoin-project/lotus/node/impl/paych" logging "github.com/ipfs/go-log" + "github.com/filecoin-project/lotus/node/impl/client" + "github.com/filecoin-project/lotus/node/impl/market" + "github.com/filecoin-project/lotus/node/impl/paych" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/address" "github.com/filecoin-project/lotus/miner" diff --git a/storage/miner.go b/storage/miner.go index c956fd115..5cc8d37ed 100644 --- a/storage/miner.go +++ b/storage/miner.go @@ -2,14 +2,11 @@ package storage import ( "context" - "github.com/filecoin-project/lotus/lib/sectorbuilder" "sync" - "github.com/filecoin-project/lotus/lib/statestore" - "github.com/ipfs/go-datastore/namespace" - "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore/namespace" logging "github.com/ipfs/go-log" "github.com/libp2p/go-libp2p-core/host" "github.com/pkg/errors" @@ -19,6 +16,8 @@ import ( "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/lib/statestore" ) var log = logging.Logger("storageminer") diff --git a/storage/post.go b/storage/post.go index 13a635c0d..ad1050dfb 100644 --- a/storage/post.go +++ b/storage/post.go @@ -2,18 +2,17 @@ package storage import ( "context" - "github.com/filecoin-project/lotus/lib/sectorbuilder" "time" "github.com/ipfs/go-cid" "go.opencensus.io/trace" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" ) func (m *Miner) beginPosting(ctx context.Context) { diff --git a/storage/sector_states.go b/storage/sector_states.go index f94b06072..d91e3cead 100644 --- a/storage/sector_states.go +++ b/storage/sector_states.go @@ -2,15 +2,15 @@ package storage import ( "context" - "github.com/filecoin-project/lotus/lib/sectorbuilder" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/types" "github.com/pkg/errors" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" ) type providerHandlerFunc func(ctx context.Context, deal SectorInfo) (func(*SectorInfo), error)