From 05cdeb80c3c19c827a6ab6e132b7cbd309061a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 15 Jun 2022 12:06:22 +0200 Subject: [PATCH] chore: remove redundant import prefixes --- api/api_net.go | 2 +- api/api_storage.go | 2 +- api/api_worker.go | 2 +- api/docgen/docgen.go | 4 ++-- api/version.go | 2 +- blockstore/badger/blockstore_test.go | 2 +- blockstore/blockstore.go | 2 +- blockstore/discard.go | 2 +- blockstore/idstore.go | 2 +- blockstore/splitstore/checkpoint.go | 2 +- blockstore/splitstore/coldset.go | 2 +- blockstore/splitstore/debug.go | 2 +- blockstore/splitstore/markset.go | 2 +- blockstore/splitstore/markset_badger.go | 2 +- blockstore/splitstore/markset_map.go | 2 +- blockstore/splitstore/markset_test.go | 2 +- blockstore/splitstore/splitstore.go | 2 +- blockstore/splitstore/splitstore_check.go | 2 +- blockstore/splitstore/splitstore_compact.go | 2 +- blockstore/splitstore/splitstore_expose.go | 2 +- blockstore/splitstore/splitstore_reify.go | 2 +- blockstore/splitstore/splitstore_test.go | 4 ++-- blockstore/splitstore/splitstore_util.go | 2 +- blockstore/splitstore/splitstore_warmup.go | 2 +- blockstore/splitstore/visitor.go | 2 +- chain/actors/adt/store.go | 2 +- chain/actors/builtin/paych/paych.go | 2 +- chain/actors/manifest.go | 2 +- chain/consensus/filcns/filecoin.go | 2 +- chain/exchange/peer_tracker.go | 2 +- chain/gen/gen.go | 2 +- chain/state/statetree_test.go | 2 +- chain/stmgr/actors.go | 2 +- chain/store/index_test.go | 2 +- chain/store/store_test.go | 2 +- chain/sub/incoming.go | 4 ++-- chain/sync_manager.go | 2 +- chain/types/blockheader.go | 2 +- chain/types/blockheader_test.go | 2 +- chain/types/message.go | 2 +- chain/types/vmcontext.go | 2 +- chain/vm/syscalls.go | 2 +- chain/vm/vm.go | 2 +- cli/chain.go | 4 ++-- cli/chain_test.go | 4 ++-- cli/mpool.go | 2 +- cli/mpool_manage.go | 4 ++-- cli/multisig.go | 2 +- cli/net.go | 2 +- cli/params.go | 2 +- cli/send_test.go | 4 ++-- cli/sending_ui.go | 4 ++-- cli/services.go | 4 ++-- cli/services_send_test.go | 6 +++--- cli/sync.go | 2 +- cli/wallet_test.go | 2 +- cmd/lotus-bench/import.go | 2 +- cmd/lotus-bench/main.go | 6 +++--- cmd/lotus-bench/simple.go | 4 ++-- cmd/lotus-health/main.go | 2 +- cmd/lotus-health/main_test.go | 2 +- cmd/lotus-miner/init.go | 2 +- cmd/lotus-miner/storage.go | 2 +- cmd/lotus-seed/seed/seed.go | 4 ++-- cmd/lotus-shed/blockmsgid.go | 2 +- cmd/lotus-shed/params.go | 2 +- cmd/lotus-stats/main.go | 2 +- cmd/lotus-worker/main.go | 2 +- cmd/lotus/daemon.go | 2 +- conformance/chaos/actor_test.go | 2 +- itests/kit/ensemble.go | 4 ++-- itests/kit/files.go | 2 +- lib/oldpath/oldresolver/resolver.go | 2 +- lib/oldpath/path.go | 2 +- lib/peermgr/peermgr.go | 4 ++-- lib/ulimit/ulimit_unix.go | 2 +- markets/utils/converters.go | 2 +- node/builder_chain.go | 2 +- node/builder_miner.go | 2 +- node/bundle/bundle.go | 2 +- node/impl/full/state.go | 2 +- node/impl/full/sync.go | 2 +- node/impl/storminer.go | 2 +- node/modules/dtypes/protector.go | 2 +- node/modules/dtypes/scorekeeper.go | 2 +- node/modules/lp2p/pubsub.go | 6 +++--- node/modules/lp2p/relay.go | 2 +- node/modules/lp2p/routing.go | 2 +- node/modules/lp2p/transport.go | 2 +- node/modules/services.go | 4 ++-- node/repo/fsrepo.go | 2 +- node/repo/memrepo.go | 2 +- paychmgr/manager.go | 2 +- storage/paths/http_handler.go | 2 +- storage/paths/http_handler_test.go | 4 ++-- storage/paths/index.go | 2 +- storage/paths/index_locks.go | 2 +- storage/paths/index_test.go | 2 +- storage/paths/interface.go | 2 +- storage/paths/local.go | 2 +- storage/paths/remote.go | 2 +- storage/paths/remote_test.go | 4 ++-- storage/pipeline/commit_batch.go | 2 +- storage/pipeline/commit_batch_test.go | 2 +- storage/pipeline/fsm.go | 2 +- storage/pipeline/precommit_batch.go | 2 +- storage/pipeline/precommit_batch_test.go | 2 +- storage/pipeline/precommit_policy_test.go | 2 +- storage/pipeline/states_failed_test.go | 4 ++-- storage/pipeline/states_proving.go | 2 +- storage/pipeline/states_replica_update.go | 4 ++-- storage/pipeline/types_test.go | 2 +- storage/sealer/faults.go | 2 +- storage/sealer/ffiwrapper/basicfs/fs.go | 2 +- storage/sealer/ffiwrapper/sealer_cgo.go | 4 ++-- storage/sealer/ffiwrapper/sealer_test.go | 4 ++-- storage/sealer/ffiwrapper/types.go | 2 +- storage/sealer/ffiwrapper/verifier_cgo.go | 2 +- storage/sealer/fr32/readers_test.go | 2 +- storage/sealer/manager.go | 6 +++--- storage/sealer/manager_test.go | 6 +++--- storage/sealer/mock/mock.go | 4 ++-- storage/sealer/piece_provider.go | 2 +- storage/sealer/piece_provider_test.go | 2 +- storage/sealer/roprov.go | 2 +- storage/sealer/sched_assigner_spread.go | 2 +- storage/sealer/sched_assigner_utilization.go | 2 +- storage/sealer/sched_post.go | 4 ++-- storage/sealer/sched_resources.go | 2 +- storage/sealer/sched_test.go | 2 +- storage/sealer/selector_alloc.go | 2 +- storage/sealer/selector_existing.go | 2 +- storage/sealer/selector_move.go | 2 +- storage/sealer/testworker_test.go | 4 ++-- storage/sealer/worker_local.go | 4 ++-- storage/sealer/worker_tracked.go | 2 +- tools/stats/influx/influx.go | 2 +- 137 files changed, 171 insertions(+), 171 deletions(-) diff --git a/api/api_net.go b/api/api_net.go index ae53e4c0d43..32c280828b9 100644 --- a/api/api_net.go +++ b/api/api_net.go @@ -4,7 +4,7 @@ import ( "context" "time" - metrics "github.com/libp2p/go-libp2p-core/metrics" + "github.com/libp2p/go-libp2p-core/metrics" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" diff --git a/api/api_storage.go b/api/api_storage.go index 11cf27469ad..0584f85fdf1 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/storage/pipeline/sealiface" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) // MODIFYING THE API INTERFACE diff --git a/api/api_worker.go b/api/api_worker.go index 184424d8edd..688151a8cde 100644 --- a/api/api_worker.go +++ b/api/api_worker.go @@ -11,7 +11,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) // MODIFYING THE API INTERFACE diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go index 9f6fc27f9db..569d366df62 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -27,7 +27,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" - filestore "github.com/filecoin-project/go-fil-markets/filestore" + "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-state-types/abi" @@ -43,7 +43,7 @@ import ( "github.com/filecoin-project/lotus/node/repo/imports" sealing "github.com/filecoin-project/lotus/storage/pipeline" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var ExampleValues = map[reflect.Type]interface{}{ diff --git a/api/version.go b/api/version.go index cc0c7b270c1..b47a6ef33a4 100644 --- a/api/version.go +++ b/api/version.go @@ -3,7 +3,7 @@ package api import ( "fmt" - xerrors "golang.org/x/xerrors" + "golang.org/x/xerrors" ) type Version uint32 diff --git a/blockstore/badger/blockstore_test.go b/blockstore/badger/blockstore_test.go index 82ea7368c6b..8d1465a7955 100644 --- a/blockstore/badger/blockstore_test.go +++ b/blockstore/badger/blockstore_test.go @@ -11,7 +11,7 @@ import ( "testing" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index 7e2e0b5c6a6..7c3deadb869 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -3,7 +3,7 @@ package blockstore import ( "context" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" blockstore "github.com/ipfs/go-ipfs-blockstore" logging "github.com/ipfs/go-log/v2" diff --git a/blockstore/discard.go b/blockstore/discard.go index 575c752d40c..a8e6cfec7a9 100644 --- a/blockstore/discard.go +++ b/blockstore/discard.go @@ -5,7 +5,7 @@ import ( "io" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ) var _ Blockstore = (*discardstore)(nil) diff --git a/blockstore/idstore.go b/blockstore/idstore.go index ef4cb76e11f..cfe4dbb9f5b 100644 --- a/blockstore/idstore.go +++ b/blockstore/idstore.go @@ -5,7 +5,7 @@ import ( "io" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/checkpoint.go b/blockstore/splitstore/checkpoint.go index dd9e84aef69..a8b41b6052f 100644 --- a/blockstore/splitstore/checkpoint.go +++ b/blockstore/splitstore/checkpoint.go @@ -5,7 +5,7 @@ import ( "io" "os" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/coldset.go b/blockstore/splitstore/coldset.go index 76d7c81177f..27dd30db41d 100644 --- a/blockstore/splitstore/coldset.go +++ b/blockstore/splitstore/coldset.go @@ -5,7 +5,7 @@ import ( "io" "os" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/debug.go b/blockstore/splitstore/debug.go index d3607ea6986..f059ae4ced9 100644 --- a/blockstore/splitstore/debug.go +++ b/blockstore/splitstore/debug.go @@ -13,7 +13,7 @@ import ( "time" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "go.uber.org/multierr" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/markset.go b/blockstore/splitstore/markset.go index 498034016de..7a584d027ca 100644 --- a/blockstore/splitstore/markset.go +++ b/blockstore/splitstore/markset.go @@ -3,7 +3,7 @@ package splitstore import ( "errors" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/markset_badger.go b/blockstore/splitstore/markset_badger.go index ce3fc57866a..e98046862f0 100644 --- a/blockstore/splitstore/markset_badger.go +++ b/blockstore/splitstore/markset_badger.go @@ -8,7 +8,7 @@ import ( "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/options" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "go.uber.org/zap" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/markset_map.go b/blockstore/splitstore/markset_map.go index dd22e987e41..52efcb8a484 100644 --- a/blockstore/splitstore/markset_map.go +++ b/blockstore/splitstore/markset_map.go @@ -7,7 +7,7 @@ import ( "path/filepath" "sync" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/markset_test.go b/blockstore/splitstore/markset_test.go index 4d67909b03c..bcfb9454ba1 100644 --- a/blockstore/splitstore/markset_test.go +++ b/blockstore/splitstore/markset_test.go @@ -4,7 +4,7 @@ package splitstore import ( "testing" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" ) diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go index 91df77c6f8d..45d7720e0a5 100644 --- a/blockstore/splitstore/splitstore.go +++ b/blockstore/splitstore/splitstore.go @@ -9,7 +9,7 @@ import ( "time" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" dstore "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" "go.opencensus.io/stats" diff --git a/blockstore/splitstore/splitstore_check.go b/blockstore/splitstore/splitstore_check.go index be4f9f5902a..dc8de7b96c6 100644 --- a/blockstore/splitstore/splitstore_check.go +++ b/blockstore/splitstore/splitstore_check.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" bstore "github.com/filecoin-project/lotus/blockstore" diff --git a/blockstore/splitstore/splitstore_compact.go b/blockstore/splitstore/splitstore_compact.go index dda356e9d4d..25dbd65f4f8 100644 --- a/blockstore/splitstore/splitstore_compact.go +++ b/blockstore/splitstore/splitstore_compact.go @@ -11,7 +11,7 @@ import ( "time" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/stats" "golang.org/x/sync/errgroup" diff --git a/blockstore/splitstore/splitstore_expose.go b/blockstore/splitstore/splitstore_expose.go index 6f838229d68..7cef66b11de 100644 --- a/blockstore/splitstore/splitstore_expose.go +++ b/blockstore/splitstore/splitstore_expose.go @@ -5,7 +5,7 @@ import ( "errors" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" bstore "github.com/filecoin-project/lotus/blockstore" ) diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go index f36098a75ec..eb24ac20904 100644 --- a/blockstore/splitstore/splitstore_reify.go +++ b/blockstore/splitstore/splitstore_reify.go @@ -6,7 +6,7 @@ import ( "sync/atomic" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" ) diff --git a/blockstore/splitstore/splitstore_test.go b/blockstore/splitstore/splitstore_test.go index d64c1798759..8d210f9ed18 100644 --- a/blockstore/splitstore/splitstore_test.go +++ b/blockstore/splitstore/splitstore_test.go @@ -12,8 +12,8 @@ import ( "time" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" - datastore "github.com/ipfs/go-datastore" + "github.com/ipfs/go-cid" + "github.com/ipfs/go-datastore" dssync "github.com/ipfs/go-datastore/sync" logging "github.com/ipfs/go-log/v2" mh "github.com/multiformats/go-multihash" diff --git a/blockstore/splitstore/splitstore_util.go b/blockstore/splitstore/splitstore_util.go index 6ab60b7604a..6e317f4d4bf 100644 --- a/blockstore/splitstore/splitstore_util.go +++ b/blockstore/splitstore/splitstore_util.go @@ -3,7 +3,7 @@ package splitstore import ( "encoding/binary" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" diff --git a/blockstore/splitstore/splitstore_warmup.go b/blockstore/splitstore/splitstore_warmup.go index b4ba7b03a5a..a496f335fae 100644 --- a/blockstore/splitstore/splitstore_warmup.go +++ b/blockstore/splitstore/splitstore_warmup.go @@ -6,7 +6,7 @@ import ( "time" blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" diff --git a/blockstore/splitstore/visitor.go b/blockstore/splitstore/visitor.go index 4a78f1db1b5..f43bef67518 100644 --- a/blockstore/splitstore/visitor.go +++ b/blockstore/splitstore/visitor.go @@ -3,7 +3,7 @@ package splitstore import ( "sync" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ) // ObjectVisitor is an interface for deduplicating objects during walks diff --git a/chain/actors/adt/store.go b/chain/actors/adt/store.go index b4116bb4356..71a7df7cb69 100644 --- a/chain/actors/adt/store.go +++ b/chain/actors/adt/store.go @@ -5,7 +5,7 @@ import ( cbor "github.com/ipfs/go-ipld-cbor" - adt "github.com/filecoin-project/specs-actors/actors/util/adt" + "github.com/filecoin-project/specs-actors/actors/util/adt" ) type Store interface { diff --git a/chain/actors/builtin/paych/paych.go b/chain/actors/builtin/paych/paych.go index 75ea6f33442..20d9d255215 100644 --- a/chain/actors/builtin/paych/paych.go +++ b/chain/actors/builtin/paych/paych.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - big "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/big" paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-state-types/cbor" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" diff --git a/chain/actors/manifest.go b/chain/actors/manifest.go index c59af7c5549..555a7e1e835 100644 --- a/chain/actors/manifest.go +++ b/chain/actors/manifest.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" diff --git a/chain/consensus/filcns/filecoin.go b/chain/consensus/filcns/filecoin.go index bafc029f47d..b4fb40d5213 100644 --- a/chain/consensus/filcns/filecoin.go +++ b/chain/consensus/filcns/filecoin.go @@ -42,7 +42,7 @@ import ( "github.com/filecoin-project/lotus/lib/async" "github.com/filecoin-project/lotus/lib/sigs" "github.com/filecoin-project/lotus/metrics" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) var log = logging.Logger("fil-consensus") diff --git a/chain/exchange/peer_tracker.go b/chain/exchange/peer_tracker.go index 835a5b8a479..489408624d6 100644 --- a/chain/exchange/peer_tracker.go +++ b/chain/exchange/peer_tracker.go @@ -8,7 +8,7 @@ import ( "sync" "time" - host "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" "go.uber.org/fx" diff --git a/chain/gen/gen.go b/chain/gen/gen.go index 42d9b573850..768da71e824 100644 --- a/chain/gen/gen.go +++ b/chain/gen/gen.go @@ -43,7 +43,7 @@ import ( "github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/node/repo" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) const msgsPerBlock = 20 diff --git a/chain/state/statetree_test.go b/chain/state/statetree_test.go index ce772a80b85..981842255bd 100644 --- a/chain/state/statetree_test.go +++ b/chain/state/statetree_test.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" - address "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/network" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" diff --git a/chain/stmgr/actors.go b/chain/stmgr/actors.go index 5995d91ad52..dca02ce3497 100644 --- a/chain/stmgr/actors.go +++ b/chain/stmgr/actors.go @@ -5,7 +5,7 @@ import ( "context" "os" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" diff --git a/chain/store/index_test.go b/chain/store/index_test.go index 24d5b66b398..86aa84cb84a 100644 --- a/chain/store/index_test.go +++ b/chain/store/index_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - datastore "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore" syncds "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/assert" diff --git a/chain/store/store_test.go b/chain/store/store_test.go index cf0d6e16c7d..95de8401b9e 100644 --- a/chain/store/store_test.go +++ b/chain/store/store_test.go @@ -7,7 +7,7 @@ import ( "io" "testing" - datastore "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go index 7c4df3c9a9a..41a10042ff2 100644 --- a/chain/sub/incoming.go +++ b/chain/sub/incoming.go @@ -12,14 +12,14 @@ import ( bserv "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" - connmgr "github.com/libp2p/go-libp2p-core/connmgr" + "github.com/libp2p/go-libp2p-core/connmgr" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" "go.opencensus.io/stats" "go.opencensus.io/tag" "golang.org/x/xerrors" - address "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-legs/dtsync" "github.com/filecoin-project/lotus/build" diff --git a/chain/sync_manager.go b/chain/sync_manager.go index 82de35add45..a472bafb5e3 100644 --- a/chain/sync_manager.go +++ b/chain/sync_manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/peer" "github.com/filecoin-project/go-address" diff --git a/chain/types/blockheader.go b/chain/types/blockheader.go index b700c96991a..e0b9e6b30bb 100644 --- a/chain/types/blockheader.go +++ b/chain/types/blockheader.go @@ -7,7 +7,7 @@ import ( block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/minio/blake2b-simd" - xerrors "golang.org/x/xerrors" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" diff --git a/chain/types/blockheader_test.go b/chain/types/blockheader_test.go index 80c97482c71..248016b2870 100644 --- a/chain/types/blockheader_test.go +++ b/chain/types/blockheader_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" diff --git a/chain/types/message.go b/chain/types/message.go index dc9accc4346..5b2aad47e90 100644 --- a/chain/types/message.go +++ b/chain/types/message.go @@ -7,7 +7,7 @@ import ( block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - xerrors "golang.org/x/xerrors" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" diff --git a/chain/types/vmcontext.go b/chain/types/vmcontext.go index a8fd907a203..2702153b6a7 100644 --- a/chain/types/vmcontext.go +++ b/chain/types/vmcontext.go @@ -1,7 +1,7 @@ package types import ( - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/go-address" diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go index 83f4c56fbe7..7120393194c 100644 --- a/chain/vm/syscalls.go +++ b/chain/vm/syscalls.go @@ -27,7 +27,7 @@ import ( "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/lib/sigs" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) func init() { diff --git a/chain/vm/vm.go b/chain/vm/vm.go index d016914dd00..00007f29bdb 100644 --- a/chain/vm/vm.go +++ b/chain/vm/vm.go @@ -8,7 +8,7 @@ import ( "time" block "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log/v2" mh "github.com/multiformats/go-multihash" diff --git a/cli/chain.go b/cli/chain.go index 856751ed779..be9279542b2 100644 --- a/cli/chain.go +++ b/cli/chain.go @@ -16,7 +16,7 @@ import ( "strings" "time" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" @@ -38,7 +38,7 @@ import ( "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/consensus/filcns" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) var ChainCmd = &cli.Command{ diff --git a/cli/chain_test.go b/cli/chain_test.go index 41f0525b2c1..dfef27b115f 100644 --- a/cli/chain_test.go +++ b/cli/chain_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/golang/mock/gomock" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" "github.com/filecoin-project/go-state-types/abi" @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/lotus/api" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" ) diff --git a/cli/mpool.go b/cli/mpool.go index 0224b15d2b9..1410814b53a 100644 --- a/cli/mpool.go +++ b/cli/mpool.go @@ -7,7 +7,7 @@ import ( "sort" "strconv" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cli/mpool_manage.go b/cli/mpool_manage.go index d344557305a..67724c77332 100644 --- a/cli/mpool_manage.go +++ b/cli/mpool_manage.go @@ -7,7 +7,7 @@ import ( "github.com/Kubuxu/imtui" "github.com/gdamore/tcell/v2" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" @@ -17,7 +17,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/messagepool" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) var mpoolManage = &cli.Command{ diff --git a/cli/multisig.go b/cli/multisig.go index 84803183e61..d88f5d963dc 100644 --- a/cli/multisig.go +++ b/cli/multisig.go @@ -10,7 +10,7 @@ import ( "strconv" "text/tabwriter" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/cli/net.go b/cli/net.go index 5c9578616ba..23691974fe3 100644 --- a/cli/net.go +++ b/cli/net.go @@ -15,7 +15,7 @@ import ( "github.com/fatih/color" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" - protocol "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p-core/protocol" "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cli/params.go b/cli/params.go index d391c1b8573..4dcbe67e2a0 100644 --- a/cli/params.go +++ b/cli/params.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/xerrors" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/lotus/build" ) diff --git a/cli/send_test.go b/cli/send_test.go index 571cb42b673..3ee6ad992d5 100644 --- a/cli/send_test.go +++ b/cli/send_test.go @@ -6,7 +6,7 @@ import ( "bytes" "testing" - gomock "github.com/golang/mock/gomock" + "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ucli "github.com/urfave/cli/v2" @@ -14,7 +14,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/api" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) func mustAddr(a address.Address, err error) address.Address { diff --git a/cli/sending_ui.go b/cli/sending_ui.go index 5cd763fc2db..d2d2ed3c110 100644 --- a/cli/sending_ui.go +++ b/cli/sending_ui.go @@ -9,7 +9,7 @@ import ( "github.com/Kubuxu/imtui" "github.com/gdamore/tcell/v2" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" @@ -18,7 +18,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) func InteractiveSend(ctx context.Context, cctx *cli.Context, srv ServicesAPI, diff --git a/cli/services.go b/cli/services.go index 287deb5127c..d90da419c67 100644 --- a/cli/services.go +++ b/cli/services.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" @@ -18,7 +18,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/consensus/filcns" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) //go:generate go run github.com/golang/mock/mockgen -destination=servicesmock_test.go -package=cli -self_package github.com/filecoin-project/lotus/cli . ServicesAPI diff --git a/cli/services_send_test.go b/cli/services_send_test.go index a73fabe3cef..fe9bb0e898d 100644 --- a/cli/services_send_test.go +++ b/cli/services_send_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - gomock "github.com/golang/mock/gomock" + "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/filecoin-project/go-address" @@ -15,8 +15,8 @@ import ( "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/lotus/api" - mocks "github.com/filecoin-project/lotus/api/mocks" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/api/mocks" + "github.com/filecoin-project/lotus/chain/types" ) type markerKeyType struct{} diff --git a/cli/sync.go b/cli/sync.go index 2dddbab89fc..02e4e381ff7 100644 --- a/cli/sync.go +++ b/cli/sync.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "github.com/filecoin-project/go-state-types/abi" diff --git a/cli/wallet_test.go b/cli/wallet_test.go index 9a806266b35..01aa0dd7c32 100644 --- a/cli/wallet_test.go +++ b/cli/wallet_test.go @@ -20,7 +20,7 @@ import ( "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" - types "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) func TestWalletNew(t *testing.T) { diff --git a/cmd/lotus-bench/import.go b/cmd/lotus-bench/import.go index 10e8791ff66..31ee0d51eaa 100644 --- a/cmd/lotus-bench/import.go +++ b/cmd/lotus-bench/import.go @@ -43,7 +43,7 @@ import ( _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" "github.com/filecoin-project/lotus/node/repo" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) type TipSetExec struct { diff --git a/cmd/lotus-bench/main.go b/cmd/lotus-bench/main.go index f71fc0333e4..6803fd90216 100644 --- a/cmd/lotus-bench/main.go +++ b/cmd/lotus-bench/main.go @@ -19,7 +19,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/abi" prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" @@ -30,9 +30,9 @@ import ( "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/genesis" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper/basicfs" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var log = logging.Logger("lotus-bench") diff --git a/cmd/lotus-bench/simple.go b/cmd/lotus-bench/simple.go index ba3890cb41c..7ddf161aa77 100644 --- a/cmd/lotus-bench/simple.go +++ b/cmd/lotus-bench/simple.go @@ -24,8 +24,8 @@ import ( "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var simpleCmd = &cli.Command{ diff --git a/cmd/lotus-health/main.go b/cmd/lotus-health/main.go index c1bf7a45945..a7052f21480 100644 --- a/cmd/lotus-health/main.go +++ b/cmd/lotus-health/main.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/urfave/cli/v2" diff --git a/cmd/lotus-health/main_test.go b/cmd/lotus-health/main_test.go index f2264227911..40ca9d40929 100644 --- a/cmd/lotus-health/main_test.go +++ b/cmd/lotus-health/main_test.go @@ -4,7 +4,7 @@ package main import ( "testing" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" "github.com/stretchr/testify/assert" ) diff --git a/cmd/lotus-miner/init.go b/cmd/lotus-miner/init.go index cfb1c7f2b59..2daced42e32 100644 --- a/cmd/lotus-miner/init.go +++ b/cmd/lotus-miner/init.go @@ -25,7 +25,7 @@ import ( "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/builtin" diff --git a/cmd/lotus-miner/storage.go b/cmd/lotus-miner/storage.go index 6101bdde082..7823f484d54 100644 --- a/cmd/lotus-miner/storage.go +++ b/cmd/lotus-miner/storage.go @@ -31,7 +31,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" sealing "github.com/filecoin-project/lotus/storage/pipeline" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) const metaFile = "sectorstore.json" diff --git a/cmd/lotus-seed/seed/seed.go b/cmd/lotus-seed/seed/seed.go index 58624eb8b56..5af234e5c83 100644 --- a/cmd/lotus-seed/seed/seed.go +++ b/cmd/lotus-seed/seed/seed.go @@ -29,9 +29,9 @@ import ( "github.com/filecoin-project/lotus/chain/wallet/key" "github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/storage/paths" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper/basicfs" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var log = logging.Logger("preseal") diff --git a/cmd/lotus-shed/blockmsgid.go b/cmd/lotus-shed/blockmsgid.go index 4a0250d1e5f..c52c87c36c0 100644 --- a/cmd/lotus-shed/blockmsgid.go +++ b/cmd/lotus-shed/blockmsgid.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/ipfs/go-cid" - blake2b "github.com/minio/blake2b-simd" + "github.com/minio/blake2b-simd" "github.com/urfave/cli/v2" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/lotus-shed/params.go b/cmd/lotus-shed/params.go index 107a04ac209..08ce5ba83f1 100644 --- a/cmd/lotus-shed/params.go +++ b/cmd/lotus-shed/params.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/xerrors" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-stats/main.go b/cmd/lotus-stats/main.go index 2c3b80b3cc3..20b2ee45c81 100644 --- a/cmd/lotus-stats/main.go +++ b/cmd/lotus-stats/main.go @@ -10,7 +10,7 @@ import ( "contrib.go.opencensus.io/exporter/prometheus" logging "github.com/ipfs/go-log/v2" "github.com/urfave/cli/v2" - stats "go.opencensus.io/stats" + "go.opencensus.io/stats" "go.opencensus.io/stats/view" "github.com/filecoin-project/go-state-types/abi" diff --git a/cmd/lotus-worker/main.go b/cmd/lotus-worker/main.go index 7f3f38566ed..41a59f6b458 100644 --- a/cmd/lotus-worker/main.go +++ b/cmd/lotus-worker/main.go @@ -22,7 +22,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-jsonrpc/auth" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-statestore" "github.com/filecoin-project/lotus/api" diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index b3f4db837b2..33c579e3a95 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -28,7 +28,7 @@ import ( "gopkg.in/cheggaaa/pb.v1" "github.com/filecoin-project/go-jsonrpc" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" diff --git a/conformance/chaos/actor_test.go b/conformance/chaos/actor_test.go index 51b1655cfb2..0764463fc88 100644 --- a/conformance/chaos/actor_test.go +++ b/conformance/chaos/actor_test.go @@ -11,7 +11,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/exitcode" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - mock "github.com/filecoin-project/specs-actors/v2/support/mock" + "github.com/filecoin-project/specs-actors/v2/support/mock" atesting2 "github.com/filecoin-project/specs-actors/v2/support/testing" ) diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go index 6f9c24e3284..4c71c238b23 100644 --- a/itests/kit/ensemble.go +++ b/itests/kit/ensemble.go @@ -47,7 +47,7 @@ import ( "github.com/filecoin-project/lotus/cmd/lotus-worker/sealworker" "github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/markets/idxprov" - idxprov_test "github.com/filecoin-project/lotus/markets/idxprov/idxprov_test" + "github.com/filecoin-project/lotus/markets/idxprov/idxprov_test" lotusminer "github.com/filecoin-project/lotus/miner" "github.com/filecoin-project/lotus/node" "github.com/filecoin-project/lotus/node/config" @@ -58,7 +58,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" sectorstorage "github.com/filecoin-project/lotus/storage/sealer" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" - mock "github.com/filecoin-project/lotus/storage/sealer/mock" + "github.com/filecoin-project/lotus/storage/sealer/mock" ) func init() { diff --git a/itests/kit/files.go b/itests/kit/files.go index ca76ad36755..3fa8a5f4d11 100644 --- a/itests/kit/files.go +++ b/itests/kit/files.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" - cidutil "github.com/ipfs/go-cidutil" + "github.com/ipfs/go-cidutil" ds "github.com/ipfs/go-datastore" dssync "github.com/ipfs/go-datastore/sync" bstore "github.com/ipfs/go-ipfs-blockstore" diff --git a/lib/oldpath/oldresolver/resolver.go b/lib/oldpath/oldresolver/resolver.go index f92aaee2e1d..7c598c66e63 100644 --- a/lib/oldpath/oldresolver/resolver.go +++ b/lib/oldpath/oldresolver/resolver.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log/v2" dag "github.com/ipfs/go-merkledag" diff --git a/lib/oldpath/path.go b/lib/oldpath/path.go index fe4bd67a24b..9cc99ce5ce7 100644 --- a/lib/oldpath/path.go +++ b/lib/oldpath/path.go @@ -5,7 +5,7 @@ import ( "path" "strings" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ) // helper type so path parsing errors include the path diff --git a/lib/peermgr/peermgr.go b/lib/peermgr/peermgr.go index 6f4cf88d73d..1ab81aff292 100644 --- a/lib/peermgr/peermgr.go +++ b/lib/peermgr/peermgr.go @@ -7,9 +7,9 @@ import ( logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/event" - host "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p-core/host" net "github.com/libp2p/go-libp2p-core/network" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/peer" dht "github.com/libp2p/go-libp2p-kad-dht" "go.opencensus.io/stats" "go.uber.org/fx" diff --git a/lib/ulimit/ulimit_unix.go b/lib/ulimit/ulimit_unix.go index ac9f4ca908c..f36d7a58b66 100644 --- a/lib/ulimit/ulimit_unix.go +++ b/lib/ulimit/ulimit_unix.go @@ -4,7 +4,7 @@ package ulimit import ( - unix "golang.org/x/sys/unix" + "golang.org/x/sys/unix" ) func init() { diff --git a/markets/utils/converters.go b/markets/utils/converters.go index 9a715b40fdb..f77297070d0 100644 --- a/markets/utils/converters.go +++ b/markets/utils/converters.go @@ -1,7 +1,7 @@ package utils import ( - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/peer" "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-address" diff --git a/node/builder_chain.go b/node/builder_chain.go index bc53a131834..21727459187 100644 --- a/node/builder_chain.go +++ b/node/builder_chain.go @@ -39,7 +39,7 @@ import ( "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/paychmgr" "github.com/filecoin-project/lotus/paychmgr/settler" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) // Chain node provides access to the Filecoin blockchain, by setting up a full diff --git a/node/builder_miner.go b/node/builder_miner.go index e0c71838e2b..17cd5d293e0 100644 --- a/node/builder_miner.go +++ b/node/builder_miner.go @@ -36,7 +36,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" sealing "github.com/filecoin-project/lotus/storage/pipeline" sectorstorage "github.com/filecoin-project/lotus/storage/sealer" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sectorblocks" "github.com/filecoin-project/lotus/storage/wdpost" diff --git a/node/bundle/bundle.go b/node/bundle/bundle.go index 2863cab54ce..cb97838f5c3 100644 --- a/node/bundle/bundle.go +++ b/node/bundle/bundle.go @@ -6,7 +6,7 @@ import ( "io" "os" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/ipld/go-car" "golang.org/x/xerrors" diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 678cbcd8574..90f531ea7d6 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -7,7 +7,7 @@ import ( "fmt" "strconv" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/libp2p/go-libp2p-core/peer" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/impl/full/sync.go b/node/impl/full/sync.go index bd7de65b150..2809d41dcf2 100644 --- a/node/impl/full/sync.go +++ b/node/impl/full/sync.go @@ -4,7 +4,7 @@ import ( "context" "sync/atomic" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 23f7cc112c6..80410ac9a98 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -53,7 +53,7 @@ import ( "github.com/filecoin-project/lotus/storage/pipeline/sealiface" "github.com/filecoin-project/lotus/storage/sealer" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sectorblocks" "github.com/filecoin-project/lotus/storage/wdpost" ) diff --git a/node/modules/dtypes/protector.go b/node/modules/dtypes/protector.go index 0d9625fc1cd..cb7069dc8e7 100644 --- a/node/modules/dtypes/protector.go +++ b/node/modules/dtypes/protector.go @@ -1,7 +1,7 @@ package dtypes import ( - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ) type GCReferenceProtector interface { diff --git a/node/modules/dtypes/scorekeeper.go b/node/modules/dtypes/scorekeeper.go index 7999d19e56c..7154bbe8b34 100644 --- a/node/modules/dtypes/scorekeeper.go +++ b/node/modules/dtypes/scorekeeper.go @@ -3,7 +3,7 @@ package dtypes import ( "sync" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" ) diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index a59ff94dbcb..33f17a5c1dd 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -6,11 +6,11 @@ import ( "net" "time" - host "github.com/libp2p/go-libp2p-core/host" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb" - blake2b "github.com/minio/blake2b-simd" + "github.com/minio/blake2b-simd" ma "github.com/multiformats/go-multiaddr" "go.opencensus.io/stats" "go.uber.org/fx" diff --git a/node/modules/lp2p/relay.go b/node/modules/lp2p/relay.go index a6bedb12b37..78d04e33fa9 100644 --- a/node/modules/lp2p/relay.go +++ b/node/modules/lp2p/relay.go @@ -5,7 +5,7 @@ import ( "github.com/libp2p/go-libp2p" coredisc "github.com/libp2p/go-libp2p-core/discovery" - routing "github.com/libp2p/go-libp2p-core/routing" + "github.com/libp2p/go-libp2p-core/routing" discovery "github.com/libp2p/go-libp2p-discovery" ) diff --git a/node/modules/lp2p/routing.go b/node/modules/lp2p/routing.go index fe7f9d3f37c..8cc06a6f695 100644 --- a/node/modules/lp2p/routing.go +++ b/node/modules/lp2p/routing.go @@ -4,7 +4,7 @@ import ( "context" "sort" - routing "github.com/libp2p/go-libp2p-core/routing" + "github.com/libp2p/go-libp2p-core/routing" dht "github.com/libp2p/go-libp2p-kad-dht" record "github.com/libp2p/go-libp2p-record" routinghelpers "github.com/libp2p/go-libp2p-routing-helpers" diff --git a/node/modules/lp2p/transport.go b/node/modules/lp2p/transport.go index 5ea2d1c837c..4349fcd87c5 100644 --- a/node/modules/lp2p/transport.go +++ b/node/modules/lp2p/transport.go @@ -2,7 +2,7 @@ package lp2p import ( "github.com/libp2p/go-libp2p" - metrics "github.com/libp2p/go-libp2p-core/metrics" + "github.com/libp2p/go-libp2p-core/metrics" noise "github.com/libp2p/go-libp2p-noise" libp2pquic "github.com/libp2p/go-libp2p-quic-transport" tls "github.com/libp2p/go-libp2p-tls" diff --git a/node/modules/services.go b/node/modules/services.go index 2a0303fa86b..15015443538 100644 --- a/node/modules/services.go +++ b/node/modules/services.go @@ -8,8 +8,8 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" - eventbus "github.com/libp2p/go-eventbus" - event "github.com/libp2p/go-libp2p-core/event" + "github.com/libp2p/go-eventbus" + "github.com/libp2p/go-libp2p-core/event" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" diff --git a/node/repo/fsrepo.go b/node/repo/fsrepo.go index ab236e9b0cf..9327575dd5b 100644 --- a/node/repo/fsrepo.go +++ b/node/repo/fsrepo.go @@ -26,7 +26,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/storage/paths" - fsutil "github.com/filecoin-project/lotus/storage/sealer/fsutil" + "github.com/filecoin-project/lotus/storage/sealer/fsutil" ) const ( diff --git a/node/repo/memrepo.go b/node/repo/memrepo.go index d85bca7bb95..534487417c2 100644 --- a/node/repo/memrepo.go +++ b/node/repo/memrepo.go @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/storage/paths" - fsutil "github.com/filecoin-project/lotus/storage/sealer/fsutil" + "github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/storiface" ) diff --git a/paychmgr/manager.go b/paychmgr/manager.go index 38cb8b8e6d0..fda9b101f2c 100644 --- a/paychmgr/manager.go +++ b/paychmgr/manager.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" - xerrors "golang.org/x/xerrors" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" diff --git a/storage/paths/http_handler.go b/storage/paths/http_handler.go index ab067bfc47e..f15afbf3d9a 100644 --- a/storage/paths/http_handler.go +++ b/storage/paths/http_handler.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/sealer/partialfile" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sealer/tarutil" ) diff --git a/storage/paths/http_handler_test.go b/storage/paths/http_handler_test.go index 0d81dc1ef3a..624f264ff88 100644 --- a/storage/paths/http_handler_test.go +++ b/storage/paths/http_handler_test.go @@ -17,9 +17,9 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/paths" - mocks "github.com/filecoin-project/lotus/storage/paths/mocks" + "github.com/filecoin-project/lotus/storage/paths/mocks" "github.com/filecoin-project/lotus/storage/sealer/partialfile" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func TestRemoteGetAllocated(t *testing.T) { diff --git a/storage/paths/index.go b/storage/paths/index.go index d777eac37b0..634c7b6237e 100644 --- a/storage/paths/index.go +++ b/storage/paths/index.go @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/lotus/metrics" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var HeartbeatInterval = 10 * time.Second diff --git a/storage/paths/index_locks.go b/storage/paths/index_locks.go index 701ff4c3bc6..ab95cb4a7ab 100644 --- a/storage/paths/index_locks.go +++ b/storage/paths/index_locks.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type sectorLock struct { diff --git a/storage/paths/index_test.go b/storage/paths/index_test.go index 4077d5f25e1..3eb2dbec47f 100644 --- a/storage/paths/index_test.go +++ b/storage/paths/index_test.go @@ -11,7 +11,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func init() { diff --git a/storage/paths/interface.go b/storage/paths/interface.go index acbe9a0fd71..6b5519bf408 100644 --- a/storage/paths/interface.go +++ b/storage/paths/interface.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/partialfile" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) //go:generate go run github.com/golang/mock/mockgen -destination=mocks/pf.go -package=mocks . PartialFileHandler diff --git a/storage/paths/local.go b/storage/paths/local.go index efd65396dcf..e8f46353390 100644 --- a/storage/paths/local.go +++ b/storage/paths/local.go @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) // LocalStorageMeta [path]/sectorstore.json diff --git a/storage/paths/remote.go b/storage/paths/remote.go index 3529adf26a5..d44c0b55e33 100644 --- a/storage/paths/remote.go +++ b/storage/paths/remote.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/sealer/fsutil" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sealer/tarutil" ) diff --git a/storage/paths/remote_test.go b/storage/paths/remote_test.go index 2cf06fcb535..237501b7a88 100644 --- a/storage/paths/remote_test.go +++ b/storage/paths/remote_test.go @@ -25,9 +25,9 @@ import ( "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/storage/paths" - mocks "github.com/filecoin-project/lotus/storage/paths/mocks" + "github.com/filecoin-project/lotus/storage/paths/mocks" "github.com/filecoin-project/lotus/storage/sealer/partialfile" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) const metaFile = "sectorstore.json" diff --git a/storage/pipeline/commit_batch.go b/storage/pipeline/commit_batch.go index b49ed284324..0cd55da3b06 100644 --- a/storage/pipeline/commit_batch.go +++ b/storage/pipeline/commit_batch.go @@ -25,7 +25,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" - sealiface "github.com/filecoin-project/lotus/storage/pipeline/sealiface" + "github.com/filecoin-project/lotus/storage/pipeline/sealiface" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) diff --git a/storage/pipeline/commit_batch_test.go b/storage/pipeline/commit_batch_test.go index ce8309d6f11..abb44f4b419 100644 --- a/storage/pipeline/commit_batch_test.go +++ b/storage/pipeline/commit_batch_test.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" pipeline "github.com/filecoin-project/lotus/storage/pipeline" "github.com/filecoin-project/lotus/storage/pipeline/mocks" - sealiface "github.com/filecoin-project/lotus/storage/pipeline/sealiface" + "github.com/filecoin-project/lotus/storage/pipeline/sealiface" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" ) diff --git a/storage/pipeline/fsm.go b/storage/pipeline/fsm.go index 4e36ada6c57..3df57a501ad 100644 --- a/storage/pipeline/fsm.go +++ b/storage/pipeline/fsm.go @@ -13,7 +13,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" - statemachine "github.com/filecoin-project/go-statemachine" + "github.com/filecoin-project/go-statemachine" ) func (m *Sealing) Plan(events []statemachine.Event, user interface{}) (interface{}, uint64, error) { diff --git a/storage/pipeline/precommit_batch.go b/storage/pipeline/precommit_batch.go index 77bc90dd641..fb77f21f727 100644 --- a/storage/pipeline/precommit_batch.go +++ b/storage/pipeline/precommit_batch.go @@ -22,7 +22,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" - sealiface "github.com/filecoin-project/lotus/storage/pipeline/sealiface" + "github.com/filecoin-project/lotus/storage/pipeline/sealiface" ) //go:generate go run github.com/golang/mock/mockgen -destination=mocks/mock_precommit_batcher.go -package=mocks . PreCommitBatcherApi diff --git a/storage/pipeline/precommit_batch_test.go b/storage/pipeline/precommit_batch_test.go index 54cbdedd38f..3881da90ddd 100644 --- a/storage/pipeline/precommit_batch_test.go +++ b/storage/pipeline/precommit_batch_test.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/lotus/node/config" pipeline "github.com/filecoin-project/lotus/storage/pipeline" "github.com/filecoin-project/lotus/storage/pipeline/mocks" - sealiface "github.com/filecoin-project/lotus/storage/pipeline/sealiface" + "github.com/filecoin-project/lotus/storage/pipeline/sealiface" ) var fc = config.MinerFeeConfig{ diff --git a/storage/pipeline/precommit_policy_test.go b/storage/pipeline/precommit_policy_test.go index a823ef81ad0..86e5c60e263 100644 --- a/storage/pipeline/precommit_policy_test.go +++ b/storage/pipeline/precommit_policy_test.go @@ -13,7 +13,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" - api "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/policy" diff --git a/storage/pipeline/states_failed_test.go b/storage/pipeline/states_failed_test.go index f10a08cb3bd..78f55f1e77f 100644 --- a/storage/pipeline/states_failed_test.go +++ b/storage/pipeline/states_failed_test.go @@ -15,13 +15,13 @@ import ( "github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" - statemachine "github.com/filecoin-project/go-statemachine" + "github.com/filecoin-project/go-statemachine" market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" api2 "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin/market" pipeline "github.com/filecoin-project/lotus/storage/pipeline" - mocks "github.com/filecoin-project/lotus/storage/pipeline/mocks" + "github.com/filecoin-project/lotus/storage/pipeline/mocks" ) func TestStateRecoverDealIDs(t *testing.T) { diff --git a/storage/pipeline/states_proving.go b/storage/pipeline/states_proving.go index 8afa0871919..d73a61c62f5 100644 --- a/storage/pipeline/states_proving.go +++ b/storage/pipeline/states_proving.go @@ -6,7 +6,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/exitcode" - statemachine "github.com/filecoin-project/go-statemachine" + "github.com/filecoin-project/go-statemachine" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/policy" diff --git a/storage/pipeline/states_replica_update.go b/storage/pipeline/states_replica_update.go index eaecea180dc..322ad1bbd96 100644 --- a/storage/pipeline/states_replica_update.go +++ b/storage/pipeline/states_replica_update.go @@ -12,9 +12,9 @@ import ( "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" - statemachine "github.com/filecoin-project/go-statemachine" + "github.com/filecoin-project/go-statemachine" - api "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/policy" ) diff --git a/storage/pipeline/types_test.go b/storage/pipeline/types_test.go index e579009606b..69e102bf441 100644 --- a/storage/pipeline/types_test.go +++ b/storage/pipeline/types_test.go @@ -12,7 +12,7 @@ import ( markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" tutils "github.com/filecoin-project/specs-actors/v2/support/testing" - api "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api" ) func TestSectorInfoSerialization(t *testing.T) { diff --git a/storage/sealer/faults.go b/storage/sealer/faults.go index d1b2c748b8f..6100dbb876c 100644 --- a/storage/sealer/faults.go +++ b/storage/sealer/faults.go @@ -13,7 +13,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-storage/storage" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var PostCheckTimeout = 160 * time.Second diff --git a/storage/sealer/ffiwrapper/basicfs/fs.go b/storage/sealer/ffiwrapper/basicfs/fs.go index a0738280b37..5cd48bb8269 100644 --- a/storage/sealer/ffiwrapper/basicfs/fs.go +++ b/storage/sealer/ffiwrapper/basicfs/fs.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-storage/storage" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type sectorFile struct { diff --git a/storage/sealer/ffiwrapper/sealer_cgo.go b/storage/sealer/ffiwrapper/sealer_cgo.go index e138e0dae2f..e2c2d03afc9 100644 --- a/storage/sealer/ffiwrapper/sealer_cgo.go +++ b/storage/sealer/ffiwrapper/sealer_cgo.go @@ -30,9 +30,9 @@ import ( "github.com/filecoin-project/lotus/lib/nullreader" nr "github.com/filecoin-project/lotus/storage/pipeline/lib/nullreader" - fr32 "github.com/filecoin-project/lotus/storage/sealer/fr32" + "github.com/filecoin-project/lotus/storage/sealer/fr32" "github.com/filecoin-project/lotus/storage/sealer/partialfile" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var _ Storage = &Sealer{} diff --git a/storage/sealer/ffiwrapper/sealer_test.go b/storage/sealer/ffiwrapper/sealer_test.go index 7c41bd0172e..f539209f9d9 100644 --- a/storage/sealer/ffiwrapper/sealer_test.go +++ b/storage/sealer/ffiwrapper/sealer_test.go @@ -23,7 +23,7 @@ import ( ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/filecoin-ffi/cgo" commpffi "github.com/filecoin-project/go-commp-utils/ffiwrapper" - paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/abi" prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" @@ -31,7 +31,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/storage/pipeline/lib/nullreader" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper/basicfs" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func init() { diff --git a/storage/sealer/ffiwrapper/types.go b/storage/sealer/ffiwrapper/types.go index bdb41278dd6..fcf71ab8283 100644 --- a/storage/sealer/ffiwrapper/types.go +++ b/storage/sealer/ffiwrapper/types.go @@ -11,7 +11,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper/basicfs" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type Validator interface { diff --git a/storage/sealer/ffiwrapper/verifier_cgo.go b/storage/sealer/ffiwrapper/verifier_cgo.go index 7b679a31df0..2c21ebce68b 100644 --- a/storage/sealer/ffiwrapper/verifier_cgo.go +++ b/storage/sealer/ffiwrapper/verifier_cgo.go @@ -14,7 +14,7 @@ import ( "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" "github.com/filecoin-project/specs-storage/storage" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func (sb *Sealer) GenerateWinningPoSt(ctx context.Context, minerID abi.ActorID, sectorInfo []proof.ExtendedSectorInfo, randomness abi.PoStRandomness) ([]proof.PoStProof, error) { diff --git a/storage/sealer/fr32/readers_test.go b/storage/sealer/fr32/readers_test.go index 93616a69634..21a5cd9cd83 100644 --- a/storage/sealer/fr32/readers_test.go +++ b/storage/sealer/fr32/readers_test.go @@ -10,7 +10,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" - fr32 "github.com/filecoin-project/lotus/storage/sealer/fr32" + "github.com/filecoin-project/lotus/storage/sealer/fr32" ) func TestUnpadReader(t *testing.T) { diff --git a/storage/sealer/manager.go b/storage/sealer/manager.go index dd80723ec1b..cbfcfec79db 100644 --- a/storage/sealer/manager.go +++ b/storage/sealer/manager.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/go-multierror" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/mitchellh/go-homedir" "go.uber.org/multierr" @@ -20,10 +20,10 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/paths" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var log = logging.Logger("advmgr") diff --git a/storage/sealer/manager_test.go b/storage/sealer/manager_test.go index f1652ad109b..f5695fc118f 100644 --- a/storage/sealer/manager_test.go +++ b/storage/sealer/manager_test.go @@ -30,10 +30,10 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/paths" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" - fsutil "github.com/filecoin-project/lotus/storage/sealer/fsutil" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func init() { diff --git a/storage/sealer/mock/mock.go b/storage/sealer/mock/mock.go index 9b84f6b7216..ae35f969551 100644 --- a/storage/sealer/mock/mock.go +++ b/storage/sealer/mock/mock.go @@ -21,8 +21,8 @@ import ( prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var log = logging.Logger("sbmock") diff --git a/storage/sealer/piece_provider.go b/storage/sealer/piece_provider.go index 8352e011525..e3e1ca23a4b 100644 --- a/storage/sealer/piece_provider.go +++ b/storage/sealer/piece_provider.go @@ -14,7 +14,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/fr32" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type Unsealer interface { diff --git a/storage/sealer/piece_provider_test.go b/storage/sealer/piece_provider_test.go index 25840bc188d..6d9525b0ac6 100644 --- a/storage/sealer/piece_provider_test.go +++ b/storage/sealer/piece_provider_test.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) // TestPieceProviderReadPiece verifies that the ReadPiece method works correctly diff --git a/storage/sealer/roprov.go b/storage/sealer/roprov.go index c0dc083a223..e57f6a2c1b7 100644 --- a/storage/sealer/roprov.go +++ b/storage/sealer/roprov.go @@ -8,7 +8,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/paths" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type readonlyProvider struct { diff --git a/storage/sealer/sched_assigner_spread.go b/storage/sealer/sched_assigner_spread.go index 7c3466202e2..f00d24d82b0 100644 --- a/storage/sealer/sched_assigner_spread.go +++ b/storage/sealer/sched_assigner_spread.go @@ -3,7 +3,7 @@ package sealer import ( "math" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func NewSpreadAssigner() Assigner { diff --git a/storage/sealer/sched_assigner_utilization.go b/storage/sealer/sched_assigner_utilization.go index 6d29b2b83ee..2d051d0007a 100644 --- a/storage/sealer/sched_assigner_utilization.go +++ b/storage/sealer/sched_assigner_utilization.go @@ -3,7 +3,7 @@ package sealer import ( "math" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func NewLowestUtilizationAssigner() Assigner { diff --git a/storage/sealer/sched_post.go b/storage/sealer/sched_post.go index d7f0c22fd98..64986726f09 100644 --- a/storage/sealer/sched_post.go +++ b/storage/sealer/sched_post.go @@ -6,13 +6,13 @@ import ( "sync" "time" - xerrors "golang.org/x/xerrors" + "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type poStScheduler struct { diff --git a/storage/sealer/sched_resources.go b/storage/sealer/sched_resources.go index a0e5a2132d8..88725f6bacc 100644 --- a/storage/sealer/sched_resources.go +++ b/storage/sealer/sched_resources.go @@ -6,7 +6,7 @@ import ( "time" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type ActiveResources struct { diff --git a/storage/sealer/sched_test.go b/storage/sealer/sched_test.go index ca5f72da79d..8ebaa317aaf 100644 --- a/storage/sealer/sched_test.go +++ b/storage/sealer/sched_test.go @@ -23,7 +23,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) func init() { diff --git a/storage/sealer/selector_alloc.go b/storage/sealer/selector_alloc.go index 63be0a2b96a..6418dcb853a 100644 --- a/storage/sealer/selector_alloc.go +++ b/storage/sealer/selector_alloc.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type allocSelector struct { diff --git a/storage/sealer/selector_existing.go b/storage/sealer/selector_existing.go index 9abab043598..02f5eb55abd 100644 --- a/storage/sealer/selector_existing.go +++ b/storage/sealer/selector_existing.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type existingSelector struct { diff --git a/storage/sealer/selector_move.go b/storage/sealer/selector_move.go index 3ec9ddf40d5..63fd2deb53b 100644 --- a/storage/sealer/selector_move.go +++ b/storage/sealer/selector_move.go @@ -9,7 +9,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type moveSelector struct { diff --git a/storage/sealer/testworker_test.go b/storage/sealer/testworker_test.go index b9244d2007b..35169b84500 100644 --- a/storage/sealer/testworker_test.go +++ b/storage/sealer/testworker_test.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/google/uuid" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-storage/storage" @@ -13,7 +13,7 @@ import ( "github.com/filecoin-project/lotus/storage/paths" "github.com/filecoin-project/lotus/storage/sealer/mock" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type testWorker struct { diff --git a/storage/sealer/worker_local.go b/storage/sealer/worker_local.go index a29d59750a8..b2691b6ddaf 100644 --- a/storage/sealer/worker_local.go +++ b/storage/sealer/worker_local.go @@ -24,9 +24,9 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/storage/paths" - ffiwrapper "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" + "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) var pathTypes = []storiface.SectorFileType{storiface.FTUnsealed, storiface.FTSealed, storiface.FTCache, storiface.FTUpdate, storiface.FTUpdateCache} diff --git a/storage/sealer/worker_tracked.go b/storage/sealer/worker_tracked.go index 00745c9a37c..e051b14549e 100644 --- a/storage/sealer/worker_tracked.go +++ b/storage/sealer/worker_tracked.go @@ -15,7 +15,7 @@ import ( "github.com/filecoin-project/lotus/metrics" "github.com/filecoin-project/lotus/storage/sealer/sealtasks" - storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" + "github.com/filecoin-project/lotus/storage/sealer/storiface" ) type trackedWork struct { diff --git a/tools/stats/influx/influx.go b/tools/stats/influx/influx.go index 39f25edbeed..6c589fd575d 100644 --- a/tools/stats/influx/influx.go +++ b/tools/stats/influx/influx.go @@ -7,7 +7,7 @@ import ( "time" _ "github.com/influxdata/influxdb1-client" - models "github.com/influxdata/influxdb1-client/models" + "github.com/influxdata/influxdb1-client/models" client "github.com/influxdata/influxdb1-client/v2" "github.com/filecoin-project/lotus/build"