diff --git a/api/api_common.go b/api/api_common.go index 48d167b59..73a0c984c 100644 --- a/api/api_common.go +++ b/api/api_common.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - apitypes "github.com/filecoin-project/lotus/api/types" - "github.com/filecoin-project/lotus/journal/alerting" - "github.com/google/uuid" "github.com/filecoin-project/go-jsonrpc/auth" + + apitypes "github.com/filecoin-project/lotus/api/types" + "github.com/filecoin-project/lotus/journal/alerting" ) // MODIFYING THE API INTERFACE diff --git a/api/api_full.go b/api/api_full.go index 8c3c64ce2..4132fef29 100644 --- a/api/api_full.go +++ b/api/api_full.go @@ -13,17 +13,16 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/go-state-types/dline" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" - + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/dline" + apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/chain/actors/builtin" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" diff --git a/api/api_gateway.go b/api/api_gateway.go index ab5f497fe..7d84e807c 100644 --- a/api/api_gateway.go +++ b/api/api_gateway.go @@ -8,9 +8,9 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/dline" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/api/api_storage.go b/api/api_storage.go index 1985ddd5c..69d631a08 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -5,24 +5,22 @@ import ( "context" "time" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/libp2p/go-libp2p-core/peer" "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/builtin/v8/market" - abinetwork "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/go-fil-markets/piecestore" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" + abinetwork "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" diff --git a/api/api_worker.go b/api/api_worker.go index 33668c0b8..485cd0b01 100644 --- a/api/api_worker.go +++ b/api/api_worker.go @@ -3,15 +3,15 @@ package api import ( "context" - "github.com/filecoin-project/go-state-types/proof" - "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/specs-storage/storage" ) // MODIFYING THE API INTERFACE diff --git a/api/cbor_gen.go b/api/cbor_gen.go index 40982779e..66655fd75 100644 --- a/api/cbor_gen.go +++ b/api/cbor_gen.go @@ -8,12 +8,13 @@ import ( "math" "sort" - abi "github.com/filecoin-project/go-state-types/abi" - market "github.com/filecoin-project/go-state-types/builtin/v8/market" - paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + abi "github.com/filecoin-project/go-state-types/abi" + market "github.com/filecoin-project/go-state-types/builtin/v8/market" + paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" ) var _ = xerrors.Errorf diff --git a/api/docgen-openrpc/cmd/docgen_openrpc.go b/api/docgen-openrpc/cmd/docgen_openrpc.go index cc5e9f0cd..5f6bc566f 100644 --- a/api/docgen-openrpc/cmd/docgen_openrpc.go +++ b/api/docgen-openrpc/cmd/docgen_openrpc.go @@ -8,7 +8,6 @@ import ( "os" "github.com/filecoin-project/lotus/api/docgen" - docgen_openrpc "github.com/filecoin-project/lotus/api/docgen-openrpc" ) diff --git a/api/docgen-openrpc/openrpc.go b/api/docgen-openrpc/openrpc.go index 271b43ac6..c9504ba89 100644 --- a/api/docgen-openrpc/openrpc.go +++ b/api/docgen-openrpc/openrpc.go @@ -8,10 +8,11 @@ import ( "github.com/alecthomas/jsonschema" go_openrpc_reflect "github.com/etclabscore/go-openrpc-reflect" - "github.com/filecoin-project/lotus/api/docgen" - "github.com/filecoin-project/lotus/build" "github.com/ipfs/go-cid" meta_schema "github.com/open-rpc/meta-schema" + + "github.com/filecoin-project/lotus/api/docgen" + "github.com/filecoin-project/lotus/build" ) // schemaDictEntry represents a type association passed to the jsonschema reflector. diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go index d7840fd8a..8d8f64c01 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -12,11 +12,11 @@ import ( "time" "unicode" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-bitfield" "github.com/google/uuid" + blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" + textselector "github.com/ipld/go-ipld-selector-text-lite" "github.com/libp2p/go-libp2p-core/metrics" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" @@ -24,13 +24,12 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/multiformats/go-multiaddr" + "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/retrievalmarket" "github.com/filecoin-project/go-jsonrpc/auth" - blocks "github.com/ipfs/go-block-format" - textselector "github.com/ipld/go-ipld-selector-text-lite" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go index 9a2bda0b4..7e6015b90 100644 --- a/api/mocks/mock_full.go +++ b/api/mocks/mock_full.go @@ -10,6 +10,15 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" + uuid "github.com/google/uuid" + blocks "github.com/ipfs/go-block-format" + cid "github.com/ipfs/go-cid" + metrics "github.com/libp2p/go-libp2p-core/metrics" + network0 "github.com/libp2p/go-libp2p-core/network" + peer "github.com/libp2p/go-libp2p-core/peer" + protocol "github.com/libp2p/go-libp2p-core/protocol" + address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -22,6 +31,7 @@ import ( crypto "github.com/filecoin-project/go-state-types/crypto" dline "github.com/filecoin-project/go-state-types/dline" network "github.com/filecoin-project/go-state-types/network" + api "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" miner0 "github.com/filecoin-project/lotus/chain/actors/builtin/miner" @@ -29,14 +39,6 @@ import ( alerting "github.com/filecoin-project/lotus/journal/alerting" dtypes "github.com/filecoin-project/lotus/node/modules/dtypes" imports "github.com/filecoin-project/lotus/node/repo/imports" - gomock "github.com/golang/mock/gomock" - uuid "github.com/google/uuid" - blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" - metrics "github.com/libp2p/go-libp2p-core/metrics" - network0 "github.com/libp2p/go-libp2p-core/network" - peer "github.com/libp2p/go-libp2p-core/peer" - protocol "github.com/libp2p/go-libp2p-core/protocol" ) // MockFullNode is a mock of FullNode interface. diff --git a/api/proxy_gen.go b/api/proxy_gen.go index 0177ef277..09a655b73 100644 --- a/api/proxy_gen.go +++ b/api/proxy_gen.go @@ -7,6 +7,15 @@ import ( "encoding/json" "time" + "github.com/google/uuid" + blocks "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" + 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" + xerrors "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -21,6 +30,8 @@ import ( "github.com/filecoin-project/go-state-types/dline" abinetwork "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/proof" + "github.com/filecoin-project/specs-storage/storage" + apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/chain/actors/builtin" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" @@ -32,15 +43,6 @@ import ( "github.com/filecoin-project/lotus/journal/alerting" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/repo/imports" - "github.com/filecoin-project/specs-storage/storage" - "github.com/google/uuid" - blocks "github.com/ipfs/go-block-format" - "github.com/ipfs/go-cid" - 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" - xerrors "golang.org/x/xerrors" ) var ErrNotSupported = xerrors.New("method not supported") diff --git a/api/types.go b/api/types.go index 865ed48a1..6a4b18fa7 100644 --- a/api/types.go +++ b/api/types.go @@ -5,21 +5,20 @@ import ( "fmt" "time" - "github.com/filecoin-project/go-address" - - "github.com/libp2p/go-libp2p-core/network" - - datatransfer "github.com/filecoin-project/go-data-transfer" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" - + "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" ma "github.com/multiformats/go-multiaddr" + + "github.com/filecoin-project/go-address" + datatransfer "github.com/filecoin-project/go-data-transfer" + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) type MultiaddrSlice []ma.Multiaddr diff --git a/api/v0api/full.go b/api/v0api/full.go index 4721f4c63..1fbb4ff26 100644 --- a/api/v0api/full.go +++ b/api/v0api/full.go @@ -3,21 +3,22 @@ package v0api import ( "context" + blocks "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" + textselector "github.com/ipld/go-ipld-selector-text-lite" + "github.com/libp2p/go-libp2p-core/peer" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/go-state-types/dline" - blocks "github.com/ipfs/go-block-format" - "github.com/ipfs/go-cid" - textselector "github.com/ipld/go-ipld-selector-text-lite" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/dline" + "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" diff --git a/api/v0api/gateway.go b/api/v0api/gateway.go index 70994c740..ab374b59c 100644 --- a/api/v0api/gateway.go +++ b/api/v0api/gateway.go @@ -8,10 +8,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/dline" abinetwork "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/api/v0api/permissioned.go b/api/v0api/permissioned.go index ad64bc29e..95fccdfbb 100644 --- a/api/v0api/permissioned.go +++ b/api/v0api/permissioned.go @@ -2,6 +2,7 @@ package v0api import ( "github.com/filecoin-project/go-jsonrpc/auth" + "github.com/filecoin-project/lotus/api" ) diff --git a/api/v0api/proxy_gen.go b/api/v0api/proxy_gen.go index a2a69f163..4e771361e 100644 --- a/api/v0api/proxy_gen.go +++ b/api/v0api/proxy_gen.go @@ -5,6 +5,11 @@ package v0api import ( "context" + blocks "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" + "github.com/libp2p/go-libp2p-core/peer" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -16,6 +21,7 @@ import ( "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" abinetwork "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" @@ -23,10 +29,6 @@ import ( marketevents "github.com/filecoin-project/lotus/markets/loggers" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/repo/imports" - blocks "github.com/ipfs/go-block-format" - "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" - "golang.org/x/xerrors" ) var ErrNotSupported = xerrors.New("method not supported") diff --git a/api/v0api/v0mocks/mock_full.go b/api/v0api/v0mocks/mock_full.go index ef194e9d3..a256a1ae6 100644 --- a/api/v0api/v0mocks/mock_full.go +++ b/api/v0api/v0mocks/mock_full.go @@ -9,6 +9,15 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" + uuid "github.com/google/uuid" + blocks "github.com/ipfs/go-block-format" + cid "github.com/ipfs/go-cid" + metrics "github.com/libp2p/go-libp2p-core/metrics" + network0 "github.com/libp2p/go-libp2p-core/network" + peer "github.com/libp2p/go-libp2p-core/peer" + protocol "github.com/libp2p/go-libp2p-core/protocol" + address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -22,6 +31,7 @@ import ( crypto "github.com/filecoin-project/go-state-types/crypto" dline "github.com/filecoin-project/go-state-types/dline" network "github.com/filecoin-project/go-state-types/network" + api "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" v0api "github.com/filecoin-project/lotus/api/v0api" @@ -31,14 +41,6 @@ import ( marketevents "github.com/filecoin-project/lotus/markets/loggers" dtypes "github.com/filecoin-project/lotus/node/modules/dtypes" imports "github.com/filecoin-project/lotus/node/repo/imports" - gomock "github.com/golang/mock/gomock" - uuid "github.com/google/uuid" - blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" - metrics "github.com/libp2p/go-libp2p-core/metrics" - network0 "github.com/libp2p/go-libp2p-core/network" - peer "github.com/libp2p/go-libp2p-core/peer" - protocol "github.com/libp2p/go-libp2p-core/protocol" ) // MockFullNode is a mock of FullNode interface. diff --git a/api/v0api/v1_wrapper.go b/api/v0api/v1_wrapper.go index d6de6f416..ea9754ea5 100644 --- a/api/v0api/v1_wrapper.go +++ b/api/v0api/v1_wrapper.go @@ -3,24 +3,21 @@ package v0api import ( "context" - "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/ipfs/go-cid" "github.com/libp2p/go-libp2p-core/peer" - - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - marketevents "github.com/filecoin-project/lotus/markets/loggers" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/chain/types" "golang.org/x/xerrors" - "github.com/ipfs/go-cid" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v1api" + "github.com/filecoin-project/lotus/chain/types" + marketevents "github.com/filecoin-project/lotus/markets/loggers" ) type WrapperV1Full struct { diff --git a/blockstore/autobatch.go b/blockstore/autobatch.go index c2c281446..01cee2772 100644 --- a/blockstore/autobatch.go +++ b/blockstore/autobatch.go @@ -5,10 +5,9 @@ import ( "sync" "time" - "golang.org/x/xerrors" - block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) // autolog is a logger for the autobatching blockstore. It is subscoped from the diff --git a/blockstore/badger/blockstore.go b/blockstore/badger/blockstore.go index 270e5b820..51a2b1591 100644 --- a/blockstore/badger/blockstore.go +++ b/blockstore/badger/blockstore.go @@ -13,13 +13,12 @@ import ( "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/options" "github.com/dgraph-io/badger/v2/pb" - "github.com/multiformats/go-base32" - "go.uber.org/zap" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" logger "github.com/ipfs/go-log/v2" pool "github.com/libp2p/go-buffer-pool" + "github.com/multiformats/go-base32" + "go.uber.org/zap" "github.com/filecoin-project/lotus/blockstore" ) diff --git a/blockstore/badger/blockstore_test.go b/blockstore/badger/blockstore_test.go index 470326123..82ea7368c 100644 --- a/blockstore/badger/blockstore_test.go +++ b/blockstore/badger/blockstore_test.go @@ -10,11 +10,10 @@ import ( "strings" "testing" - "github.com/stretchr/testify/require" - "golang.org/x/sync/errgroup" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" + "github.com/stretchr/testify/require" + "golang.org/x/sync/errgroup" "github.com/filecoin-project/lotus/blockstore" ) diff --git a/blockstore/badger/blockstore_test_suite.go b/blockstore/badger/blockstore_test_suite.go index 93b268a65..fc947f5d6 100644 --- a/blockstore/badger/blockstore_test_suite.go +++ b/blockstore/badger/blockstore_test_suite.go @@ -12,10 +12,9 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" u "github.com/ipfs/go-ipfs-util" + "github.com/stretchr/testify/require" "github.com/filecoin-project/lotus/blockstore" - - "github.com/stretchr/testify/require" ) // TODO: move this to go-ipfs-blockstore. diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index 409c100cf..7e2e0b5c6 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -5,9 +5,8 @@ import ( cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log/v2" - blockstore "github.com/ipfs/go-ipfs-blockstore" + logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("blockstore") diff --git a/blockstore/fallback.go b/blockstore/fallback.go index 3d0acd36d..2cba8a3f7 100644 --- a/blockstore/fallback.go +++ b/blockstore/fallback.go @@ -5,10 +5,9 @@ import ( "sync" "time" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) // UnwrapFallbackStore takes a blockstore, and returns the underlying blockstore diff --git a/blockstore/idstore.go b/blockstore/idstore.go index c6281998a..ef4cb76e1 100644 --- a/blockstore/idstore.go +++ b/blockstore/idstore.go @@ -4,11 +4,10 @@ import ( "context" "io" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" + "golang.org/x/xerrors" ) var _ Blockstore = (*idstore)(nil) diff --git a/blockstore/ipfs.go b/blockstore/ipfs.go index 787c71d7d..9ca5e7e0c 100644 --- a/blockstore/ipfs.go +++ b/blockstore/ipfs.go @@ -5,17 +5,15 @@ import ( "context" "io/ioutil" - "golang.org/x/xerrors" - - "github.com/multiformats/go-multiaddr" - "github.com/multiformats/go-multihash" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" httpapi "github.com/ipfs/go-ipfs-http-client" iface "github.com/ipfs/interface-go-ipfs-core" "github.com/ipfs/interface-go-ipfs-core/options" "github.com/ipfs/interface-go-ipfs-core/path" + "github.com/multiformats/go-multiaddr" + "github.com/multiformats/go-multihash" + "golang.org/x/xerrors" ) type IPFSBlockstore struct { diff --git a/blockstore/splitstore/checkpoint.go b/blockstore/splitstore/checkpoint.go index d3cd4cba7..dd9e84aef 100644 --- a/blockstore/splitstore/checkpoint.go +++ b/blockstore/splitstore/checkpoint.go @@ -5,10 +5,9 @@ import ( "io" "os" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" + "golang.org/x/xerrors" ) type Checkpoint struct { diff --git a/blockstore/splitstore/coldset.go b/blockstore/splitstore/coldset.go index 129e2ed92..76d7c8117 100644 --- a/blockstore/splitstore/coldset.go +++ b/blockstore/splitstore/coldset.go @@ -5,9 +5,8 @@ import ( "io" "os" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) type ColdSetWriter struct { diff --git a/blockstore/splitstore/debug.go b/blockstore/splitstore/debug.go index 2be85ebfe..d3607ea69 100644 --- a/blockstore/splitstore/debug.go +++ b/blockstore/splitstore/debug.go @@ -12,11 +12,10 @@ import ( "sync" "time" - "go.uber.org/multierr" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" + "go.uber.org/multierr" + "golang.org/x/xerrors" ) type debugLog struct { diff --git a/blockstore/splitstore/markset.go b/blockstore/splitstore/markset.go index e67494538..498034016 100644 --- a/blockstore/splitstore/markset.go +++ b/blockstore/splitstore/markset.go @@ -3,9 +3,8 @@ package splitstore import ( "errors" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) var errMarkSetClosed = errors.New("markset closed") diff --git a/blockstore/splitstore/markset_badger.go b/blockstore/splitstore/markset_badger.go index 659d3b5dd..ce3fc5786 100644 --- a/blockstore/splitstore/markset_badger.go +++ b/blockstore/splitstore/markset_badger.go @@ -6,13 +6,11 @@ import ( "runtime" "sync" - "golang.org/x/xerrors" - "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/options" - "go.uber.org/zap" - cid "github.com/ipfs/go-cid" + "go.uber.org/zap" + "golang.org/x/xerrors" ) type BadgerMarkSetEnv struct { diff --git a/blockstore/splitstore/markset_map.go b/blockstore/splitstore/markset_map.go index 8216bcd81..dd22e987e 100644 --- a/blockstore/splitstore/markset_map.go +++ b/blockstore/splitstore/markset_map.go @@ -7,9 +7,8 @@ import ( "path/filepath" "sync" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) type MapMarkSetEnv struct { diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go index a351df76a..91df77c6f 100644 --- a/blockstore/splitstore/splitstore.go +++ b/blockstore/splitstore/splitstore.go @@ -8,22 +8,21 @@ import ( "sync/atomic" "time" - "go.uber.org/multierr" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" dstore "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" + "go.opencensus.io/stats" + "go.uber.org/multierr" + "golang.org/x/xerrors" "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/stmgr" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/metrics" - - "go.opencensus.io/stats" ) var ( diff --git a/blockstore/splitstore/splitstore_check.go b/blockstore/splitstore/splitstore_check.go index d7c9b2ef9..be4f9f590 100644 --- a/blockstore/splitstore/splitstore_check.go +++ b/blockstore/splitstore/splitstore_check.go @@ -8,9 +8,8 @@ import ( "sync/atomic" "time" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" bstore "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/types" diff --git a/blockstore/splitstore/splitstore_compact.go b/blockstore/splitstore/splitstore_compact.go index ae123abc9..dda356e9d 100644 --- a/blockstore/splitstore/splitstore_compact.go +++ b/blockstore/splitstore/splitstore_compact.go @@ -10,20 +10,19 @@ import ( "sync/atomic" "time" - "golang.org/x/sync/errgroup" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + "go.opencensus.io/stats" + "golang.org/x/sync/errgroup" + "golang.org/x/xerrors" "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/types" "github.com/filecoin-project/lotus/metrics" - - "go.opencensus.io/stats" ) var ( diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go index 85c4fa289..f36098a75 100644 --- a/blockstore/splitstore/splitstore_reify.go +++ b/blockstore/splitstore/splitstore_reify.go @@ -5,10 +5,9 @@ import ( "runtime" "sync/atomic" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) var ( diff --git a/blockstore/splitstore/splitstore_test.go b/blockstore/splitstore/splitstore_test.go index f2213aecc..d64c17987 100644 --- a/blockstore/splitstore/splitstore_test.go +++ b/blockstore/splitstore/splitstore_test.go @@ -11,18 +11,19 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/chain/stmgr" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/chain/types/mock" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" datastore "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" + + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types/mock" ) func init() { diff --git a/blockstore/splitstore/splitstore_util.go b/blockstore/splitstore/splitstore_util.go index aef845832..6ab60b760 100644 --- a/blockstore/splitstore/splitstore_util.go +++ b/blockstore/splitstore/splitstore_util.go @@ -3,10 +3,9 @@ package splitstore import ( "encoding/binary" - "golang.org/x/xerrors" - cid "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" + "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" ) diff --git a/blockstore/splitstore/splitstore_warmup.go b/blockstore/splitstore/splitstore_warmup.go index b564f03c7..b4ba7b03a 100644 --- a/blockstore/splitstore/splitstore_warmup.go +++ b/blockstore/splitstore/splitstore_warmup.go @@ -5,12 +5,12 @@ import ( "sync/atomic" "time" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "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/types" diff --git a/blockstore/timed_test.go b/blockstore/timed_test.go index df0d6c035..bfd6e8140 100644 --- a/blockstore/timed_test.go +++ b/blockstore/timed_test.go @@ -6,11 +6,10 @@ import ( "testing" "time" - "github.com/raulk/clock" - "github.com/stretchr/testify/require" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" + "github.com/raulk/clock" + "github.com/stretchr/testify/require" ) func TestTimedCacheBlockstoreSimple(t *testing.T) { diff --git a/build/bootstrap.go b/build/bootstrap.go index 98fa2e2f9..244c378b3 100644 --- a/build/bootstrap.go +++ b/build/bootstrap.go @@ -6,9 +6,9 @@ import ( "path" "strings" - "github.com/filecoin-project/lotus/lib/addrutil" - "github.com/libp2p/go-libp2p-core/peer" + + "github.com/filecoin-project/lotus/lib/addrutil" ) //go:embed bootstrap diff --git a/build/builtin_actors.go b/build/builtin_actors.go index 39f414c89..ba61fc70e 100644 --- a/build/builtin_actors.go +++ b/build/builtin_actors.go @@ -12,15 +12,15 @@ import ( "strconv" "strings" - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/DataDog/zstd" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/ipld/go-car" "golang.org/x/xerrors" + + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" ) //go:embed actors/*.tar.zst diff --git a/build/builtin_actors_test.go b/build/builtin_actors_test.go index 389de5cbf..7a5c0936d 100644 --- a/build/builtin_actors_test.go +++ b/build/builtin_actors_test.go @@ -3,9 +3,10 @@ package build_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" - "github.com/stretchr/testify/require" ) // Test that the embedded metadata is correct. diff --git a/build/params_butterfly.go b/build/params_butterfly.go index f99b6d7e3..866f7646b 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -4,13 +4,15 @@ package build import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/policy" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/ipfs/go-cid" ) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ diff --git a/build/params_calibnet.go b/build/params_calibnet.go index c940d58e4..00c171d85 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -4,13 +4,15 @@ package build import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/policy" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/ipfs/go-cid" ) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ diff --git a/build/params_interop.go b/build/params_interop.go index bc5098f22..f3af7aed4 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -7,13 +7,15 @@ import ( "os" "strconv" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/policy" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/ipfs/go-cid" ) var NetworkBundle = "caterpillarnet" diff --git a/build/params_mainnet.go b/build/params_mainnet.go index 4ac898f48..79db2d98b 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -7,12 +7,12 @@ import ( "math" "os" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + + "github.com/filecoin-project/lotus/chain/actors" ) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ diff --git a/build/params_shared_funcs.go b/build/params_shared_funcs.go index 7dd2dc8da..bbeecacfc 100644 --- a/build/params_shared_funcs.go +++ b/build/params_shared_funcs.go @@ -1,11 +1,11 @@ package build import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) diff --git a/build/params_shared_vals.go b/build/params_shared_vals.go index d8d0a5382..6f59189a6 100644 --- a/build/params_shared_vals.go +++ b/build/params_shared_vals.go @@ -10,7 +10,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/policy" diff --git a/build/params_testground.go b/build/params_testground.go index 3123a3bd0..3cadf41ab 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -11,10 +11,10 @@ package build import ( "math/big" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/network" "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" diff --git a/chain/actors/adt/diff_adt.go b/chain/actors/adt/diff_adt.go index 160e12e19..7f2f35eab 100644 --- a/chain/actors/adt/diff_adt.go +++ b/chain/actors/adt/diff_adt.go @@ -3,8 +3,9 @@ package adt import ( "bytes" - "github.com/filecoin-project/go-state-types/abi" typegen "github.com/whyrusleeping/cbor-gen" + + "github.com/filecoin-project/go-state-types/abi" ) // AdtArrayDiff generalizes adt.Array diffing by accepting a Deferred type that can unmarshalled to its corresponding struct diff --git a/chain/actors/adt/diff_adt_test.go b/chain/actors/adt/diff_adt_test.go index 6e50a7f7c..41abaeaad 100644 --- a/chain/actors/adt/diff_adt_test.go +++ b/chain/actors/adt/diff_adt_test.go @@ -6,14 +6,12 @@ import ( "context" "testing" + cbornode "github.com/ipfs/go-ipld-cbor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - cbornode "github.com/ipfs/go-ipld-cbor" typegen "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/go-state-types/abi" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" diff --git a/chain/actors/adt/store.go b/chain/actors/adt/store.go index 8dd9841a1..b4116bb43 100644 --- a/chain/actors/adt/store.go +++ b/chain/actors/adt/store.go @@ -3,8 +3,9 @@ package adt import ( "context" - adt "github.com/filecoin-project/specs-actors/actors/util/adt" cbor "github.com/ipfs/go-ipld-cbor" + + adt "github.com/filecoin-project/specs-actors/actors/util/adt" ) type Store interface { diff --git a/chain/actors/aerrors/error.go b/chain/actors/aerrors/error.go index 12f802c8f..132cb3baf 100644 --- a/chain/actors/aerrors/error.go +++ b/chain/actors/aerrors/error.go @@ -3,8 +3,9 @@ package aerrors import ( "fmt" - "github.com/filecoin-project/go-state-types/exitcode" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/exitcode" ) func IsFatal(err ActorError) bool { diff --git a/chain/actors/aerrors/error_test.go b/chain/actors/aerrors/error_test.go index 63409ab55..189b992a8 100644 --- a/chain/actors/aerrors/error_test.go +++ b/chain/actors/aerrors/error_test.go @@ -4,11 +4,12 @@ package aerrors_test import ( "testing" - "github.com/filecoin-project/go-state-types/exitcode" - . "github.com/filecoin-project/lotus/chain/actors/aerrors" - "github.com/stretchr/testify/assert" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/exitcode" + + . "github.com/filecoin-project/lotus/chain/actors/aerrors" ) func TestFatalError(t *testing.T) { diff --git a/chain/actors/aerrors/wrap.go b/chain/actors/aerrors/wrap.go index 0552829f9..6bf8a3009 100644 --- a/chain/actors/aerrors/wrap.go +++ b/chain/actors/aerrors/wrap.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" - "github.com/filecoin-project/go-state-types/exitcode" cbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/exitcode" ) // New creates a new non-fatal error diff --git a/chain/actors/agen/main.go b/chain/actors/agen/main.go index d07c039dd..ba88c54d1 100644 --- a/chain/actors/agen/main.go +++ b/chain/actors/agen/main.go @@ -10,9 +10,9 @@ import ( "strconv" "text/template" - lotusactors "github.com/filecoin-project/lotus/chain/actors" - "golang.org/x/xerrors" + + lotusactors "github.com/filecoin-project/lotus/chain/actors" ) var actors = map[string][]int{ diff --git a/chain/actors/builtin/account/account.go b/chain/actors/builtin/account/account.go index 04bdc3920..f233f173c 100644 --- a/chain/actors/builtin/account/account.go +++ b/chain/actors/builtin/account/account.go @@ -1,30 +1,22 @@ package account import ( - "github.com/filecoin-project/lotus/chain/actors" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + builtin8 "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/cbor" - - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - builtin8 "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var Methods = builtin8.MethodsAccount diff --git a/chain/actors/builtin/account/v0.go b/chain/actors/builtin/account/v0.go index bdfca2fd7..314bd4b29 100644 --- a/chain/actors/builtin/account/v0.go +++ b/chain/actors/builtin/account/v0.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account0 "github.com/filecoin-project/specs-actors/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/account/v2.go b/chain/actors/builtin/account/v2.go index 66618e06a..605065424 100644 --- a/chain/actors/builtin/account/v2.go +++ b/chain/actors/builtin/account/v2.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/account/v3.go b/chain/actors/builtin/account/v3.go index dbe100a4f..d070476ea 100644 --- a/chain/actors/builtin/account/v3.go +++ b/chain/actors/builtin/account/v3.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/account/v4.go b/chain/actors/builtin/account/v4.go index 53f71dcc5..f4d9f7a06 100644 --- a/chain/actors/builtin/account/v4.go +++ b/chain/actors/builtin/account/v4.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/account/v5.go b/chain/actors/builtin/account/v5.go index 538f56987..5e01ce152 100644 --- a/chain/actors/builtin/account/v5.go +++ b/chain/actors/builtin/account/v5.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/account/v6.go b/chain/actors/builtin/account/v6.go index a0d157ae5..85135dcda 100644 --- a/chain/actors/builtin/account/v6.go +++ b/chain/actors/builtin/account/v6.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/account/v7.go b/chain/actors/builtin/account/v7.go index 883776cf8..4ae979b82 100644 --- a/chain/actors/builtin/account/v7.go +++ b/chain/actors/builtin/account/v7.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/account/v8.go b/chain/actors/builtin/account/v8.go index d8ef52c00..211deea33 100644 --- a/chain/actors/builtin/account/v8.go +++ b/chain/actors/builtin/account/v8.go @@ -1,12 +1,12 @@ package account import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" account8 "github.com/filecoin-project/go-state-types/builtin/v8/account" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go index d62fae462..4c994c9aa 100644 --- a/chain/actors/builtin/builtin.go +++ b/chain/actors/builtin/builtin.go @@ -3,34 +3,25 @@ package builtin import ( "fmt" - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" "golang.org/x/xerrors" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - builtin8 "github.com/filecoin-project/specs-actors/v8/actors/builtin" - + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin" - "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/lotus/chain/actors" - miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing" + "github.com/filecoin-project/go-state-types/proof" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + builtin8 "github.com/filecoin-project/specs-actors/v8/actors/builtin" + + "github.com/filecoin-project/lotus/chain/actors" ) var SystemActorAddr = builtin.SystemActorAddr diff --git a/chain/actors/builtin/cron/cron.go b/chain/actors/builtin/cron/cron.go index 1a9c32c81..00264e3b4 100644 --- a/chain/actors/builtin/cron/cron.go +++ b/chain/actors/builtin/cron/cron.go @@ -1,26 +1,20 @@ package cron import ( + "golang.org/x/xerrors" + + builtin8 "github.com/filecoin-project/go-state-types/builtin" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - "golang.org/x/xerrors" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - builtin8 "github.com/filecoin-project/go-state-types/builtin" ) func Load(store adt.Store, act *types.Actor) (State, error) { diff --git a/chain/actors/builtin/cron/v0.go b/chain/actors/builtin/cron/v0.go index 6147b858c..baa81aac3 100644 --- a/chain/actors/builtin/cron/v0.go +++ b/chain/actors/builtin/cron/v0.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/cron/v2.go b/chain/actors/builtin/cron/v2.go index 51ca179d9..d6ee35935 100644 --- a/chain/actors/builtin/cron/v2.go +++ b/chain/actors/builtin/cron/v2.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/cron/v3.go b/chain/actors/builtin/cron/v3.go index ff74d511d..356d385cd 100644 --- a/chain/actors/builtin/cron/v3.go +++ b/chain/actors/builtin/cron/v3.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/cron/v4.go b/chain/actors/builtin/cron/v4.go index 1cff8cc28..3db3c95aa 100644 --- a/chain/actors/builtin/cron/v4.go +++ b/chain/actors/builtin/cron/v4.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/cron/v5.go b/chain/actors/builtin/cron/v5.go index 2bb00dc21..5d99af1fd 100644 --- a/chain/actors/builtin/cron/v5.go +++ b/chain/actors/builtin/cron/v5.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/cron/v6.go b/chain/actors/builtin/cron/v6.go index 8bbadd79f..c86cd6c42 100644 --- a/chain/actors/builtin/cron/v6.go +++ b/chain/actors/builtin/cron/v6.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/cron/v7.go b/chain/actors/builtin/cron/v7.go index e5538c89f..db9f8f9e2 100644 --- a/chain/actors/builtin/cron/v7.go +++ b/chain/actors/builtin/cron/v7.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/cron/v8.go b/chain/actors/builtin/cron/v8.go index 00b22fcbf..00567acf9 100644 --- a/chain/actors/builtin/cron/v8.go +++ b/chain/actors/builtin/cron/v8.go @@ -3,9 +3,9 @@ package cron import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/init/diff.go b/chain/actors/builtin/init/diff.go index 5eb8f3c75..60b5a5bff 100644 --- a/chain/actors/builtin/init/diff.go +++ b/chain/actors/builtin/init/diff.go @@ -3,9 +3,10 @@ package init import ( "bytes" + typegen "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - typegen "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/lotus/chain/actors/adt" ) diff --git a/chain/actors/builtin/init/init.go b/chain/actors/builtin/init/init.go index 9ba412cf1..c7e0f7b82 100644 --- a/chain/actors/builtin/init/init.go +++ b/chain/actors/builtin/init/init.go @@ -1,33 +1,25 @@ package init import ( - "github.com/filecoin-project/lotus/chain/actors" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + builtin8 "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/cbor" - "github.com/ipfs/go-cid" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/modules/dtypes" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - builtin8 "github.com/filecoin-project/go-state-types/builtin" ) var ( diff --git a/chain/actors/builtin/init/v0.go b/chain/actors/builtin/init/v0.go index ddd2dab94..2f6b213c0 100644 --- a/chain/actors/builtin/init/v0.go +++ b/chain/actors/builtin/init/v0.go @@ -1,17 +1,17 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" init0 "github.com/filecoin-project/specs-actors/actors/builtin/init" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/init/v2.go b/chain/actors/builtin/init/v2.go index 72e2d56a5..d780a1fe9 100644 --- a/chain/actors/builtin/init/v2.go +++ b/chain/actors/builtin/init/v2.go @@ -1,17 +1,17 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/init/v3.go b/chain/actors/builtin/init/v3.go index 4609c94a3..b2f713b1f 100644 --- a/chain/actors/builtin/init/v3.go +++ b/chain/actors/builtin/init/v3.go @@ -1,19 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/init/v4.go b/chain/actors/builtin/init/v4.go index dc56d1f19..9de02816f 100644 --- a/chain/actors/builtin/init/v4.go +++ b/chain/actors/builtin/init/v4.go @@ -1,19 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/init/v5.go b/chain/actors/builtin/init/v5.go index 107366de5..f9c59f83a 100644 --- a/chain/actors/builtin/init/v5.go +++ b/chain/actors/builtin/init/v5.go @@ -1,19 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/init/v6.go b/chain/actors/builtin/init/v6.go index a5bd9edfb..494b6aaa0 100644 --- a/chain/actors/builtin/init/v6.go +++ b/chain/actors/builtin/init/v6.go @@ -1,19 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/init/v7.go b/chain/actors/builtin/init/v7.go index 341aa52cd..bc378a141 100644 --- a/chain/actors/builtin/init/v7.go +++ b/chain/actors/builtin/init/v7.go @@ -1,19 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/init/v8.go b/chain/actors/builtin/init/v8.go index 919819549..63b058e57 100644 --- a/chain/actors/builtin/init/v8.go +++ b/chain/actors/builtin/init/v8.go @@ -1,18 +1,18 @@ package init import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/node/modules/dtypes" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin8 "github.com/filecoin-project/go-state-types/builtin" init8 "github.com/filecoin-project/go-state-types/builtin/v8/init" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/market/diff.go b/chain/actors/builtin/market/diff.go index d0b4a2fd3..ef3c2c28d 100644 --- a/chain/actors/builtin/market/diff.go +++ b/chain/actors/builtin/market/diff.go @@ -3,9 +3,11 @@ package market import ( "fmt" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors/adt" cbg "github.com/whyrusleeping/cbor-gen" + + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) func DiffDealProposals(pre, cur DealProposals) (*DealProposalChanges, error) { diff --git a/chain/actors/builtin/market/market.go b/chain/actors/builtin/market/market.go index b7e4897fb..2540d71ca 100644 --- a/chain/actors/builtin/market/market.go +++ b/chain/actors/builtin/market/market.go @@ -3,32 +3,23 @@ package market import ( "unicode/utf8" - "github.com/filecoin-project/go-state-types/network" + cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/cbor" - cbg "github.com/whyrusleeping/cbor-gen" - - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - builtin8 "github.com/filecoin-project/go-state-types/builtin" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/network" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" diff --git a/chain/actors/builtin/market/v0.go b/chain/actors/builtin/market/v0.go index b57d2c724..38e92f12d 100644 --- a/chain/actors/builtin/market/v0.go +++ b/chain/actors/builtin/market/v0.go @@ -3,17 +3,17 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/market/v2.go b/chain/actors/builtin/market/v2.go index 57ded97b2..5a399e68c 100644 --- a/chain/actors/builtin/market/v2.go +++ b/chain/actors/builtin/market/v2.go @@ -3,17 +3,17 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/market/v3.go b/chain/actors/builtin/market/v3.go index f85e55456..a953429fc 100644 --- a/chain/actors/builtin/market/v3.go +++ b/chain/actors/builtin/market/v3.go @@ -3,17 +3,17 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/market/v4.go b/chain/actors/builtin/market/v4.go index 5789318fb..8e6b3cd34 100644 --- a/chain/actors/builtin/market/v4.go +++ b/chain/actors/builtin/market/v4.go @@ -3,17 +3,17 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/market/v5.go b/chain/actors/builtin/market/v5.go index 6dbb724df..5cf904e04 100644 --- a/chain/actors/builtin/market/v5.go +++ b/chain/actors/builtin/market/v5.go @@ -3,17 +3,17 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/market/v6.go b/chain/actors/builtin/market/v6.go index 15c55998e..03862ac09 100644 --- a/chain/actors/builtin/market/v6.go +++ b/chain/actors/builtin/market/v6.go @@ -3,20 +3,19 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" + market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" + adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - - market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/market/v7.go b/chain/actors/builtin/market/v7.go index a3c2c7214..2c2664110 100644 --- a/chain/actors/builtin/market/v7.go +++ b/chain/actors/builtin/market/v7.go @@ -3,20 +3,19 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" + market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - - market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/market/v8.go b/chain/actors/builtin/market/v8.go index a306c44e9..8afbf39de 100644 --- a/chain/actors/builtin/market/v8.go +++ b/chain/actors/builtin/market/v8.go @@ -3,20 +3,19 @@ package market import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" + adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/miner/diff.go b/chain/actors/builtin/miner/diff.go index dde4db890..d20a43746 100644 --- a/chain/actors/builtin/miner/diff.go +++ b/chain/actors/builtin/miner/diff.go @@ -1,9 +1,11 @@ package miner import ( - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors/adt" cbg "github.com/whyrusleeping/cbor-gen" + + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) func DiffPreCommits(pre, cur State) (*PreCommitChanges, error) { diff --git a/chain/actors/builtin/miner/miner.go b/chain/actors/builtin/miner/miner.go index 44fa080a6..820be35a4 100644 --- a/chain/actors/builtin/miner/miner.go +++ b/chain/actors/builtin/miner/miner.go @@ -1,35 +1,28 @@ package miner import ( - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/actors" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/dline" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/proof" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) func Load(store adt.Store, act *types.Actor) (State, error) { diff --git a/chain/actors/builtin/miner/v0.go b/chain/actors/builtin/miner/v0.go index a6f11179c..daa0a6bfd 100644 --- a/chain/actors/builtin/miner/v0.go +++ b/chain/actors/builtin/miner/v0.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/miner/v2.go b/chain/actors/builtin/miner/v2.go index f54526bf7..7741b5426 100644 --- a/chain/actors/builtin/miner/v2.go +++ b/chain/actors/builtin/miner/v2.go @@ -4,19 +4,19 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/miner/v3.go b/chain/actors/builtin/miner/v3.go index 0c71d0d77..8cb1c4004 100644 --- a/chain/actors/builtin/miner/v3.go +++ b/chain/actors/builtin/miner/v3.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/miner/v4.go b/chain/actors/builtin/miner/v4.go index 21f6d3feb..dc8b7a1d1 100644 --- a/chain/actors/builtin/miner/v4.go +++ b/chain/actors/builtin/miner/v4.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/miner/v5.go b/chain/actors/builtin/miner/v5.go index d5f81e175..f5ec6087b 100644 --- a/chain/actors/builtin/miner/v5.go +++ b/chain/actors/builtin/miner/v5.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/miner/v6.go b/chain/actors/builtin/miner/v6.go index 36631aed4..78445b2ba 100644 --- a/chain/actors/builtin/miner/v6.go +++ b/chain/actors/builtin/miner/v6.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/miner/v7.go b/chain/actors/builtin/miner/v7.go index 502620069..c91fceb7b 100644 --- a/chain/actors/builtin/miner/v7.go +++ b/chain/actors/builtin/miner/v7.go @@ -4,21 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-state-types/dline" builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/miner/v8.go b/chain/actors/builtin/miner/v8.go index 370e149e7..817a073a2 100644 --- a/chain/actors/builtin/miner/v8.go +++ b/chain/actors/builtin/miner/v8.go @@ -4,20 +4,20 @@ import ( "bytes" "errors" - "github.com/filecoin-project/go-bitfield" - rle "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-bitfield" + rle "github.com/filecoin-project/go-bitfield/rle" + "github.com/filecoin-project/go-state-types/abi" builtin8 "github.com/filecoin-project/go-state-types/builtin" miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" + "github.com/filecoin-project/go-state-types/dline" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/multisig/diff.go b/chain/actors/builtin/multisig/diff.go index 680d0870a..f24931fb8 100644 --- a/chain/actors/builtin/multisig/diff.go +++ b/chain/actors/builtin/multisig/diff.go @@ -1,9 +1,10 @@ package multisig import ( + cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - cbg "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/lotus/chain/actors/adt" ) diff --git a/chain/actors/builtin/multisig/message0.go b/chain/actors/builtin/multisig/message0.go index dc43a9d5d..ac538d5b0 100644 --- a/chain/actors/builtin/multisig/message0.go +++ b/chain/actors/builtin/multisig/message0.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" init0 "github.com/filecoin-project/specs-actors/actors/builtin/init" multisig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message2.go b/chain/actors/builtin/multisig/message2.go index da2700d06..6667479b1 100644 --- a/chain/actors/builtin/multisig/message2.go +++ b/chain/actors/builtin/multisig/message2.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message3.go b/chain/actors/builtin/multisig/message3.go index f5f6d8cdf..b2e5880ba 100644 --- a/chain/actors/builtin/multisig/message3.go +++ b/chain/actors/builtin/multisig/message3.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init" multisig3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message4.go b/chain/actors/builtin/multisig/message4.go index 90885aa07..c62ae3da5 100644 --- a/chain/actors/builtin/multisig/message4.go +++ b/chain/actors/builtin/multisig/message4.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init" multisig4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message5.go b/chain/actors/builtin/multisig/message5.go index 9a8110f2c..d1ae532ea 100644 --- a/chain/actors/builtin/multisig/message5.go +++ b/chain/actors/builtin/multisig/message5.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init" multisig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message6.go b/chain/actors/builtin/multisig/message6.go index b2b95245e..896ea7212 100644 --- a/chain/actors/builtin/multisig/message6.go +++ b/chain/actors/builtin/multisig/message6.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" multisig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message7.go b/chain/actors/builtin/multisig/message7.go index e7fb83e9b..b05952279 100644 --- a/chain/actors/builtin/multisig/message7.go +++ b/chain/actors/builtin/multisig/message7.go @@ -5,7 +5,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" multisig7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" diff --git a/chain/actors/builtin/multisig/message8.go b/chain/actors/builtin/multisig/message8.go index bc560f50d..dacc53108 100644 --- a/chain/actors/builtin/multisig/message8.go +++ b/chain/actors/builtin/multisig/message8.go @@ -5,13 +5,12 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin8 "github.com/filecoin-project/go-state-types/builtin" init8 "github.com/filecoin-project/go-state-types/builtin/v8/init" multisig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig" - "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/actors/builtin/multisig/multisig.go b/chain/actors/builtin/multisig/multisig.go index 3985d4466..1b2fa7948 100644 --- a/chain/actors/builtin/multisig/multisig.go +++ b/chain/actors/builtin/multisig/multisig.go @@ -9,25 +9,16 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/cbor" - - msig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - builtin8 "github.com/filecoin-project/go-state-types/builtin" + msig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig" + "github.com/filecoin-project/go-state-types/cbor" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" diff --git a/chain/actors/builtin/multisig/v0.go b/chain/actors/builtin/multisig/v0.go index ccd9a9e37..9f4d09dc1 100644 --- a/chain/actors/builtin/multisig/v0.go +++ b/chain/actors/builtin/multisig/v0.go @@ -4,16 +4,16 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/multisig/v2.go b/chain/actors/builtin/multisig/v2.go index c3579b3e2..14e895680 100644 --- a/chain/actors/builtin/multisig/v2.go +++ b/chain/actors/builtin/multisig/v2.go @@ -4,16 +4,16 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" msig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/multisig/v3.go b/chain/actors/builtin/multisig/v3.go index 80682808e..5cde148c1 100644 --- a/chain/actors/builtin/multisig/v3.go +++ b/chain/actors/builtin/multisig/v3.go @@ -4,18 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - msig3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/multisig" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/multisig/v4.go b/chain/actors/builtin/multisig/v4.go index f065f9f8c..87936661d 100644 --- a/chain/actors/builtin/multisig/v4.go +++ b/chain/actors/builtin/multisig/v4.go @@ -4,18 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - msig4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/multisig" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/multisig/v5.go b/chain/actors/builtin/multisig/v5.go index 783e3987f..d50638ca5 100644 --- a/chain/actors/builtin/multisig/v5.go +++ b/chain/actors/builtin/multisig/v5.go @@ -4,18 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - msig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/multisig/v6.go b/chain/actors/builtin/multisig/v6.go index 71ea3c00c..9246eeaa9 100644 --- a/chain/actors/builtin/multisig/v6.go +++ b/chain/actors/builtin/multisig/v6.go @@ -4,18 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - msig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/multisig/v7.go b/chain/actors/builtin/multisig/v7.go index 8ed1caacd..a6b630179 100644 --- a/chain/actors/builtin/multisig/v7.go +++ b/chain/actors/builtin/multisig/v7.go @@ -4,18 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - msig7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/multisig/v8.go b/chain/actors/builtin/multisig/v8.go index 5b76f662e..6311583b3 100644 --- a/chain/actors/builtin/multisig/v8.go +++ b/chain/actors/builtin/multisig/v8.go @@ -4,17 +4,17 @@ import ( "bytes" "encoding/binary" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin8 "github.com/filecoin-project/go-state-types/builtin" msig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/paych/message0.go b/chain/actors/builtin/paych/message0.go index 2daa0301b..d5a112d43 100644 --- a/chain/actors/builtin/paych/message0.go +++ b/chain/actors/builtin/paych/message0.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" init0 "github.com/filecoin-project/specs-actors/actors/builtin/init" paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message2.go b/chain/actors/builtin/paych/message2.go index 925ad0ed9..89a6e74ce 100644 --- a/chain/actors/builtin/paych/message2.go +++ b/chain/actors/builtin/paych/message2.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message3.go b/chain/actors/builtin/paych/message3.go index e8ae585fc..47f8e7e9e 100644 --- a/chain/actors/builtin/paych/message3.go +++ b/chain/actors/builtin/paych/message3.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init" paych3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message4.go b/chain/actors/builtin/paych/message4.go index b32b0fa57..65e63149d 100644 --- a/chain/actors/builtin/paych/message4.go +++ b/chain/actors/builtin/paych/message4.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init" paych4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message5.go b/chain/actors/builtin/paych/message5.go index 897bebe7a..ede1c8ceb 100644 --- a/chain/actors/builtin/paych/message5.go +++ b/chain/actors/builtin/paych/message5.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init" paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message6.go b/chain/actors/builtin/paych/message6.go index 11bd3a8a5..009e8641f 100644 --- a/chain/actors/builtin/paych/message6.go +++ b/chain/actors/builtin/paych/message6.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message7.go b/chain/actors/builtin/paych/message7.go index 446e54ead..430fb9341 100644 --- a/chain/actors/builtin/paych/message7.go +++ b/chain/actors/builtin/paych/message7.go @@ -3,9 +3,7 @@ package paych import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" paych7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" diff --git a/chain/actors/builtin/paych/message8.go b/chain/actors/builtin/paych/message8.go index 189b20988..3fb743bc9 100644 --- a/chain/actors/builtin/paych/message8.go +++ b/chain/actors/builtin/paych/message8.go @@ -5,12 +5,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - builtin8 "github.com/filecoin-project/go-state-types/builtin" init8 "github.com/filecoin-project/go-state-types/builtin/v8/init" paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/lotus/chain/actors" init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" diff --git a/chain/actors/builtin/paych/mock/mock.go b/chain/actors/builtin/paych/mock/mock.go index 1ecfa1130..729db5924 100644 --- a/chain/actors/builtin/paych/mock/mock.go +++ b/chain/actors/builtin/paych/mock/mock.go @@ -6,6 +6,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/chain/actors/builtin/paych" ) diff --git a/chain/actors/builtin/paych/paych.go b/chain/actors/builtin/paych/paych.go index 9dd373e8b..75ea6f334 100644 --- a/chain/actors/builtin/paych/paych.go +++ b/chain/actors/builtin/paych/paych.go @@ -4,29 +4,21 @@ import ( "encoding/base64" "fmt" + ipldcbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" "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/cbor" - ipldcbor "github.com/ipfs/go-ipld-cbor" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych" - + "github.com/filecoin-project/go-state-types/cbor" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - + paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" diff --git a/chain/actors/builtin/paych/v0.go b/chain/actors/builtin/paych/v0.go index e9bc30e3d..727525c50 100644 --- a/chain/actors/builtin/paych/v0.go +++ b/chain/actors/builtin/paych/v0.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/paych/v2.go b/chain/actors/builtin/paych/v2.go index 400305e2f..5852c9a64 100644 --- a/chain/actors/builtin/paych/v2.go +++ b/chain/actors/builtin/paych/v2.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/paych/v3.go b/chain/actors/builtin/paych/v3.go index 1d7c2f94b..5297e9d10 100644 --- a/chain/actors/builtin/paych/v3.go +++ b/chain/actors/builtin/paych/v3.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/paych" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/paych/v4.go b/chain/actors/builtin/paych/v4.go index b7d1e52a5..be10061bf 100644 --- a/chain/actors/builtin/paych/v4.go +++ b/chain/actors/builtin/paych/v4.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/paych" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/paych/v5.go b/chain/actors/builtin/paych/v5.go index b331a1500..37a917273 100644 --- a/chain/actors/builtin/paych/v5.go +++ b/chain/actors/builtin/paych/v5.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/paych/v6.go b/chain/actors/builtin/paych/v6.go index 0d60b1f03..36676d9de 100644 --- a/chain/actors/builtin/paych/v6.go +++ b/chain/actors/builtin/paych/v6.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/paych/v7.go b/chain/actors/builtin/paych/v7.go index ce09ea2e4..88b6f2b84 100644 --- a/chain/actors/builtin/paych/v7.go +++ b/chain/actors/builtin/paych/v7.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/paych/v8.go b/chain/actors/builtin/paych/v8.go index 7936b76e1..1961e69ec 100644 --- a/chain/actors/builtin/paych/v8.go +++ b/chain/actors/builtin/paych/v8.go @@ -6,11 +6,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/lotus/chain/actors/adt" - paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/power/diff.go b/chain/actors/builtin/power/diff.go index 3daa70569..bb2c354ac 100644 --- a/chain/actors/builtin/power/diff.go +++ b/chain/actors/builtin/power/diff.go @@ -1,9 +1,10 @@ package power import ( + cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - cbg "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/lotus/chain/actors/adt" ) diff --git a/chain/actors/builtin/power/power.go b/chain/actors/builtin/power/power.go index 1b79a623c..2f1cfa22f 100644 --- a/chain/actors/builtin/power/power.go +++ b/chain/actors/builtin/power/power.go @@ -1,34 +1,26 @@ package power import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + builtin8 "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/cbor" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - builtin8 "github.com/filecoin-project/go-state-types/builtin" ) var ( diff --git a/chain/actors/builtin/power/v0.go b/chain/actors/builtin/power/v0.go index e114ac219..5ae42b4df 100644 --- a/chain/actors/builtin/power/v0.go +++ b/chain/actors/builtin/power/v0.go @@ -3,16 +3,16 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" power0 "github.com/filecoin-project/specs-actors/actors/builtin/power" adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/power/v2.go b/chain/actors/builtin/power/v2.go index 405bad8ba..485819e3e 100644 --- a/chain/actors/builtin/power/v2.go +++ b/chain/actors/builtin/power/v2.go @@ -3,16 +3,16 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" power2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/power" adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/power/v3.go b/chain/actors/builtin/power/v3.go index 0ff06f617..e33ee2bb5 100644 --- a/chain/actors/builtin/power/v3.go +++ b/chain/actors/builtin/power/v3.go @@ -3,18 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - power3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/power" adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/power/v4.go b/chain/actors/builtin/power/v4.go index f121e3b2f..e5c446f07 100644 --- a/chain/actors/builtin/power/v4.go +++ b/chain/actors/builtin/power/v4.go @@ -3,18 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - power4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/power" adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/power/v5.go b/chain/actors/builtin/power/v5.go index 851522e50..aaf248058 100644 --- a/chain/actors/builtin/power/v5.go +++ b/chain/actors/builtin/power/v5.go @@ -3,18 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - power5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/power" adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/power/v6.go b/chain/actors/builtin/power/v6.go index 083b85f45..072def6e2 100644 --- a/chain/actors/builtin/power/v6.go +++ b/chain/actors/builtin/power/v6.go @@ -3,18 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - power6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/power/v7.go b/chain/actors/builtin/power/v7.go index af626cf3a..0c60b03a0 100644 --- a/chain/actors/builtin/power/v7.go +++ b/chain/actors/builtin/power/v7.go @@ -3,18 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - power7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/power/v8.go b/chain/actors/builtin/power/v8.go index 177d3bc3d..c23da6904 100644 --- a/chain/actors/builtin/power/v8.go +++ b/chain/actors/builtin/power/v8.go @@ -3,17 +3,17 @@ package power import ( "bytes" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin8 "github.com/filecoin-project/go-state-types/builtin" power8 "github.com/filecoin-project/go-state-types/builtin/v8/power" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/reward/reward.go b/chain/actors/builtin/reward/reward.go index 504c8a9ba..943386f6a 100644 --- a/chain/actors/builtin/reward/reward.go +++ b/chain/actors/builtin/reward/reward.go @@ -1,29 +1,21 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors" - reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + builtin8 "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/cbor" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - + reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - builtin8 "github.com/filecoin-project/go-state-types/builtin" - + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/actors/builtin/reward/v0.go b/chain/actors/builtin/reward/v0.go index 646ab3a9a..12bdee054 100644 --- a/chain/actors/builtin/reward/v0.go +++ b/chain/actors/builtin/reward/v0.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" smoothing0 "github.com/filecoin-project/specs-actors/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/reward/v2.go b/chain/actors/builtin/reward/v2.go index 08e9a7bc3..ed2481635 100644 --- a/chain/actors/builtin/reward/v2.go +++ b/chain/actors/builtin/reward/v2.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" reward2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/reward" smoothing2 "github.com/filecoin-project/specs-actors/v2/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/reward/v3.go b/chain/actors/builtin/reward/v3.go index fd9fa56e2..d9f4bf369 100644 --- a/chain/actors/builtin/reward/v3.go +++ b/chain/actors/builtin/reward/v3.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner" reward3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/reward" smoothing3 "github.com/filecoin-project/specs-actors/v3/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/reward/v4.go b/chain/actors/builtin/reward/v4.go index 310ca04e8..160c72ce7 100644 --- a/chain/actors/builtin/reward/v4.go +++ b/chain/actors/builtin/reward/v4.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner" reward4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/reward" smoothing4 "github.com/filecoin-project/specs-actors/v4/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/reward/v5.go b/chain/actors/builtin/reward/v5.go index 7200f7d11..838ec8f21 100644 --- a/chain/actors/builtin/reward/v5.go +++ b/chain/actors/builtin/reward/v5.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" reward5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/reward" smoothing5 "github.com/filecoin-project/specs-actors/v5/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/reward/v6.go b/chain/actors/builtin/reward/v6.go index 010a3a870..e056b22f6 100644 --- a/chain/actors/builtin/reward/v6.go +++ b/chain/actors/builtin/reward/v6.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" reward6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" smoothing6 "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/reward/v7.go b/chain/actors/builtin/reward/v7.go index 368bb3abd..5fedaa43c 100644 --- a/chain/actors/builtin/reward/v7.go +++ b/chain/actors/builtin/reward/v7.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" reward7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" smoothing7 "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/reward/v8.go b/chain/actors/builtin/reward/v8.go index 3d49063df..ecc5a94ba 100644 --- a/chain/actors/builtin/reward/v8.go +++ b/chain/actors/builtin/reward/v8.go @@ -1,15 +1,15 @@ package reward import ( - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - + "github.com/filecoin-project/go-state-types/abi" miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" reward8 "github.com/filecoin-project/go-state-types/builtin/v8/reward" smoothing8 "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing" + + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/system/system.go b/chain/actors/builtin/system/system.go index 64a0f3cba..24cf47d55 100644 --- a/chain/actors/builtin/system/system.go +++ b/chain/actors/builtin/system/system.go @@ -1,28 +1,21 @@ package system import ( + "github.com/ipfs/go-cid" + "golang.org/x/xerrors" + + builtin8 "github.com/filecoin-project/go-state-types/builtin" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" - - "golang.org/x/xerrors" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - builtin8 "github.com/filecoin-project/go-state-types/builtin" ) var ( diff --git a/chain/actors/builtin/system/v0.go b/chain/actors/builtin/system/v0.go index a5aa8e8fa..efa0741ce 100644 --- a/chain/actors/builtin/system/v0.go +++ b/chain/actors/builtin/system/v0.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system0 "github.com/filecoin-project/specs-actors/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/system/v2.go b/chain/actors/builtin/system/v2.go index aea9eff7b..e4fefd08d 100644 --- a/chain/actors/builtin/system/v2.go +++ b/chain/actors/builtin/system/v2.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/system/v3.go b/chain/actors/builtin/system/v3.go index fd5f0cd50..d2b59c8a8 100644 --- a/chain/actors/builtin/system/v3.go +++ b/chain/actors/builtin/system/v3.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/system/v4.go b/chain/actors/builtin/system/v4.go index fbdec7e93..9528c1779 100644 --- a/chain/actors/builtin/system/v4.go +++ b/chain/actors/builtin/system/v4.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/system/v5.go b/chain/actors/builtin/system/v5.go index 3d3c27a12..adc1d4553 100644 --- a/chain/actors/builtin/system/v5.go +++ b/chain/actors/builtin/system/v5.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/system/v6.go b/chain/actors/builtin/system/v6.go index 314308845..0cebadce0 100644 --- a/chain/actors/builtin/system/v6.go +++ b/chain/actors/builtin/system/v6.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/system/v7.go b/chain/actors/builtin/system/v7.go index 3987db8dd..0009773da 100644 --- a/chain/actors/builtin/system/v7.go +++ b/chain/actors/builtin/system/v7.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/system/v8.go b/chain/actors/builtin/system/v8.go index a30d5fa30..48f150fb9 100644 --- a/chain/actors/builtin/system/v8.go +++ b/chain/actors/builtin/system/v8.go @@ -3,9 +3,9 @@ package system import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors/adt" - system8 "github.com/filecoin-project/go-state-types/builtin/v8/system" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/verifreg/util.go b/chain/actors/builtin/verifreg/util.go index 197a79215..09a7a132c 100644 --- a/chain/actors/builtin/verifreg/util.go +++ b/chain/actors/builtin/verifreg/util.go @@ -1,13 +1,15 @@ package verifreg import ( + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" - "golang.org/x/xerrors" ) // taking this as a function instead of asking the caller to call it helps reduce some of the error diff --git a/chain/actors/builtin/verifreg/v0.go b/chain/actors/builtin/verifreg/v0.go index dcd34c72a..8eaf83120 100644 --- a/chain/actors/builtin/verifreg/v0.go +++ b/chain/actors/builtin/verifreg/v0.go @@ -1,15 +1,15 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" + adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" - adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" ) var _ State = (*state0)(nil) diff --git a/chain/actors/builtin/verifreg/v2.go b/chain/actors/builtin/verifreg/v2.go index dfe25f054..1857a02e4 100644 --- a/chain/actors/builtin/verifreg/v2.go +++ b/chain/actors/builtin/verifreg/v2.go @@ -1,15 +1,15 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + verifreg2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/verifreg" + adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - verifreg2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/verifreg" - adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" ) var _ State = (*state2)(nil) diff --git a/chain/actors/builtin/verifreg/v3.go b/chain/actors/builtin/verifreg/v3.go index b7ab18080..98f529a61 100644 --- a/chain/actors/builtin/verifreg/v3.go +++ b/chain/actors/builtin/verifreg/v3.go @@ -1,17 +1,16 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + verifreg3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/verifreg" + adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - verifreg3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/verifreg" - adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt" ) var _ State = (*state3)(nil) diff --git a/chain/actors/builtin/verifreg/v4.go b/chain/actors/builtin/verifreg/v4.go index aee3fbdca..08aac0c7d 100644 --- a/chain/actors/builtin/verifreg/v4.go +++ b/chain/actors/builtin/verifreg/v4.go @@ -1,17 +1,16 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + verifreg4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/verifreg" + adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - verifreg4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/verifreg" - adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt" ) var _ State = (*state4)(nil) diff --git a/chain/actors/builtin/verifreg/v5.go b/chain/actors/builtin/verifreg/v5.go index 4a74e1ea8..303b10cd1 100644 --- a/chain/actors/builtin/verifreg/v5.go +++ b/chain/actors/builtin/verifreg/v5.go @@ -1,17 +1,16 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + verifreg5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/verifreg" + adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - verifreg5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/verifreg" - adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt" ) var _ State = (*state5)(nil) diff --git a/chain/actors/builtin/verifreg/v6.go b/chain/actors/builtin/verifreg/v6.go index a776f1149..c1bcd0071 100644 --- a/chain/actors/builtin/verifreg/v6.go +++ b/chain/actors/builtin/verifreg/v6.go @@ -1,17 +1,16 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + verifreg6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" + adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - verifreg6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" ) var _ State = (*state6)(nil) diff --git a/chain/actors/builtin/verifreg/v7.go b/chain/actors/builtin/verifreg/v7.go index 39d72a15d..edce5f560 100644 --- a/chain/actors/builtin/verifreg/v7.go +++ b/chain/actors/builtin/verifreg/v7.go @@ -1,17 +1,16 @@ package verifreg import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + verifreg7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - - verifreg7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" - adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) var _ State = (*state7)(nil) diff --git a/chain/actors/builtin/verifreg/v8.go b/chain/actors/builtin/verifreg/v8.go index 95fdf2e6d..00e0636ef 100644 --- a/chain/actors/builtin/verifreg/v8.go +++ b/chain/actors/builtin/verifreg/v8.go @@ -1,16 +1,16 @@ package verifreg import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" builtin8 "github.com/filecoin-project/go-state-types/builtin" adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt" verifreg8 "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" + + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" ) var _ State = (*state8)(nil) diff --git a/chain/actors/builtin/verifreg/verifreg.go b/chain/actors/builtin/verifreg/verifreg.go index 7c04bb733..0e35af648 100644 --- a/chain/actors/builtin/verifreg/verifreg.go +++ b/chain/actors/builtin/verifreg/verifreg.go @@ -5,24 +5,15 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - - "github.com/filecoin-project/go-state-types/cbor" - - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - builtin8 "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/cbor" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" diff --git a/chain/actors/manifest.go b/chain/actors/manifest.go index a00c50217..c59af7c55 100644 --- a/chain/actors/manifest.go +++ b/chain/actors/manifest.go @@ -5,13 +5,13 @@ import ( "strings" "sync" - "github.com/filecoin-project/go-state-types/manifest" - - "golang.org/x/xerrors" - - "github.com/filecoin-project/lotus/chain/actors/adt" cid "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" + "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/manifest" + + "github.com/filecoin-project/lotus/chain/actors/adt" ) var manifestCids map[Version]cid.Cid = make(map[Version]cid.Cid) diff --git a/chain/actors/params.go b/chain/actors/params.go index 6dc0b1084..f09b0be55 100644 --- a/chain/actors/params.go +++ b/chain/actors/params.go @@ -3,10 +3,11 @@ package actors import ( "bytes" + cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/lotus/chain/actors/aerrors" - cbg "github.com/whyrusleeping/cbor-gen" ) func SerializeParams(i cbg.CBORMarshaler) ([]byte, aerrors.ActorError) { diff --git a/chain/actors/policy/policy.go b/chain/actors/policy/policy.go index f4f04f4a9..746b19287 100644 --- a/chain/actors/policy/policy.go +++ b/chain/actors/policy/policy.go @@ -3,61 +3,46 @@ package policy import ( "sort" - "github.com/filecoin-project/go-state-types/big" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + builtin8 "github.com/filecoin-project/go-state-types/builtin" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" + miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" + paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych" + verifreg8 "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/actors" - market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" - verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" - power0 "github.com/filecoin-project/specs-actors/actors/builtin/power" - + verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" verifreg2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/verifreg" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" - market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market" miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner" verifreg3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/verifreg" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market" miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner" verifreg4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/verifreg" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market" miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" verifreg5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/verifreg" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" verifreg6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" verifreg7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" - builtin8 "github.com/filecoin-project/go-state-types/builtin" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner" - verifreg8 "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" - - paych8 "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/lotus/chain/actors" ) const ( diff --git a/chain/badtscache.go b/chain/badtscache.go index 42564128e..19b79bb9b 100644 --- a/chain/badtscache.go +++ b/chain/badtscache.go @@ -3,9 +3,10 @@ package chain import ( "fmt" - "github.com/filecoin-project/lotus/build" lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/lotus/build" ) type BadBlockCache struct { diff --git a/chain/beacon/beacon.go b/chain/beacon/beacon.go index 9c795fc91..aa76bcffe 100644 --- a/chain/beacon/beacon.go +++ b/chain/beacon/beacon.go @@ -3,12 +3,12 @@ package beacon import ( "context" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/go-state-types/abi" logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/beacon/drand/drand.go b/chain/beacon/drand/drand.go index 550fefab4..5b6cc45bd 100644 --- a/chain/beacon/drand/drand.go +++ b/chain/beacon/drand/drand.go @@ -5,8 +5,6 @@ import ( "context" "time" - "github.com/filecoin-project/go-state-types/network" - dchain "github.com/drand/drand/chain" dclient "github.com/drand/drand/client" hclient "github.com/drand/drand/client/http" @@ -15,13 +13,13 @@ import ( "github.com/drand/kyber" kzap "github.com/go-kit/kit/log/zap" lru "github.com/hashicorp/golang-lru" + logging "github.com/ipfs/go-log/v2" + pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/zap/zapcore" "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" - pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/beacon" diff --git a/chain/beacon/drand/drand_test.go b/chain/beacon/drand/drand_test.go index 4990dfb01..e9267f8fc 100644 --- a/chain/beacon/drand/drand_test.go +++ b/chain/beacon/drand/drand_test.go @@ -6,12 +6,12 @@ import ( "os" "testing" - "github.com/filecoin-project/go-state-types/network" - dchain "github.com/drand/drand/chain" hclient "github.com/drand/drand/client/http" "github.com/stretchr/testify/assert" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/build" ) diff --git a/chain/beacon/mock.go b/chain/beacon/mock.go index 811698905..3f26da109 100644 --- a/chain/beacon/mock.go +++ b/chain/beacon/mock.go @@ -6,12 +6,13 @@ import ( "encoding/binary" "time" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/types" "github.com/minio/blake2b-simd" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" + + "github.com/filecoin-project/lotus/chain/types" ) // Mock beacon assumes that filecoin rounds are 1:1 mapped with the beacon rounds diff --git a/chain/block_receipt_tracker.go b/chain/block_receipt_tracker.go index a4a6743d1..2cdb5f184 100644 --- a/chain/block_receipt_tracker.go +++ b/chain/block_receipt_tracker.go @@ -5,10 +5,11 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/types" lru "github.com/hashicorp/golang-lru" "github.com/libp2p/go-libp2p-core/peer" + + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) type blockReceiptTracker struct { diff --git a/chain/checkpoint.go b/chain/checkpoint.go index 4f8310593..f9b0bb4eb 100644 --- a/chain/checkpoint.go +++ b/chain/checkpoint.go @@ -3,9 +3,9 @@ package chain import ( "context" - "github.com/filecoin-project/lotus/chain/types" - "golang.org/x/xerrors" + + "github.com/filecoin-project/lotus/chain/types" ) func (syncer *Syncer) SyncCheckpoint(ctx context.Context, tsk types.TipSetKey) error { diff --git a/chain/consensus/filcns/compute_state.go b/chain/consensus/filcns/compute_state.go index 657b2dd5a..7ec83f12e 100644 --- a/chain/consensus/filcns/compute_state.go +++ b/chain/consensus/filcns/compute_state.go @@ -7,9 +7,7 @@ import ( /* inline-gen template {{range .actorVersions}} exported{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin/exported"{{end}} - /* inline-gen start */ - exported0 "github.com/filecoin-project/specs-actors/actors/builtin/exported" exported2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/exported" exported3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/exported" @@ -20,9 +18,6 @@ import ( exported8 "github.com/filecoin-project/specs-actors/v8/actors/builtin/exported" /* inline-gen end */ - - "github.com/filecoin-project/lotus/chain/rand" - "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/stats" @@ -39,6 +34,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/cron" "github.com/filecoin-project/lotus/chain/actors/builtin/reward" + "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/consensus/filcns/filecoin.go b/chain/consensus/filcns/filecoin.go index be608cecc..b33dc1ace 100644 --- a/chain/consensus/filcns/filecoin.go +++ b/chain/consensus/filcns/filecoin.go @@ -9,8 +9,6 @@ import ( "strings" "time" - "github.com/filecoin-project/lotus/chain/rand" - "github.com/hashicorp/go-multierror" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" @@ -35,6 +33,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/builtin/power" "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/consensus" + "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index 300ab1eb9..dfeae1ea8 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -17,7 +17,6 @@ import ( "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/rt" gstStore "github.com/filecoin-project/go-state-types/store" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" multisig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig" diff --git a/chain/consensus/iface.go b/chain/consensus/iface.go index 76b6d52f1..06dc0a113 100644 --- a/chain/consensus/iface.go +++ b/chain/consensus/iface.go @@ -6,6 +6,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/consensus/utils.go b/chain/consensus/utils.go index 81e78bd88..2fb43b608 100644 --- a/chain/consensus/utils.go +++ b/chain/consensus/utils.go @@ -4,7 +4,6 @@ import ( "context" "errors" - blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/trace" @@ -12,6 +11,7 @@ import ( ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-state-types/crypto" + blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" ) var ErrTemporal = errors.New("temporal error") diff --git a/chain/events/cache.go b/chain/events/cache.go index ef4b5bba8..2eba1f085 100644 --- a/chain/events/cache.go +++ b/chain/events/cache.go @@ -3,11 +3,13 @@ package events import ( "context" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" ) type uncachedAPI interface { diff --git a/chain/events/events.go b/chain/events/events.go index 5c494fcb0..86aded64d 100644 --- a/chain/events/events.go +++ b/chain/events/events.go @@ -3,11 +3,12 @@ package events import ( "context" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/events/events_called.go b/chain/events/events_called.go index ffca57d5b..d9aa34161 100644 --- a/chain/events/events_called.go +++ b/chain/events/events_called.go @@ -5,12 +5,12 @@ import ( "math" "sync" - "github.com/filecoin-project/lotus/chain/stmgr" - - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/events_height.go b/chain/events/events_height.go index 6734d3ca0..457933fc6 100644 --- a/chain/events/events_height.go +++ b/chain/events/events_height.go @@ -4,10 +4,11 @@ import ( "context" "sync" - "github.com/filecoin-project/go-state-types/abi" "go.opencensus.io/trace" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/events_test.go b/chain/events/events_test.go index d20be550b..8c07a9eb3 100644 --- a/chain/events/events_test.go +++ b/chain/events/events_test.go @@ -7,11 +7,10 @@ import ( "sync" "testing" - "gotest.tools/assert" - "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" + "gotest.tools/assert" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" diff --git a/chain/events/message_cache.go b/chain/events/message_cache.go index 75e179ad9..81b79cb38 100644 --- a/chain/events/message_cache.go +++ b/chain/events/message_cache.go @@ -4,9 +4,10 @@ import ( "context" "sync" - "github.com/filecoin-project/lotus/api" lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/lotus/api" ) type messageCache struct { diff --git a/chain/events/observer.go b/chain/events/observer.go index 7c365c7c5..72b9deaee 100644 --- a/chain/events/observer.go +++ b/chain/events/observer.go @@ -5,10 +5,11 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/abi" "go.opencensus.io/trace" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/store" diff --git a/chain/events/state/mock/api.go b/chain/events/state/mock/api.go index a66b65b3e..cdec42659 100644 --- a/chain/events/state/mock/api.go +++ b/chain/events/state/mock/api.go @@ -5,12 +5,13 @@ import ( "sync" blocks "github.com/ipfs/go-block-format" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/types" ) type MockAPI struct { diff --git a/chain/events/state/mock/state.go b/chain/events/state/mock/state.go index bac06b59f..e3c6dde57 100644 --- a/chain/events/state/mock/state.go +++ b/chain/events/state/mock/state.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" "github.com/filecoin-project/specs-actors/v2/actors/util/adt" - "github.com/stretchr/testify/require" ) func CreateEmptyMarketState(t *testing.T, store adt.Store) *market.State { diff --git a/chain/events/state/mock/tipset.go b/chain/events/state/mock/tipset.go index 39d42d6e5..0d25b8790 100644 --- a/chain/events/state/mock/tipset.go +++ b/chain/events/state/mock/tipset.go @@ -1,10 +1,12 @@ package test import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" ) var dummyCid cid.Cid diff --git a/chain/events/state/predicates.go b/chain/events/state/predicates.go index 33f496289..ff05156a6 100644 --- a/chain/events/state/predicates.go +++ b/chain/events/state/predicates.go @@ -3,18 +3,18 @@ package state import ( "context" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors/adt" init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/state/predicates_test.go b/chain/events/state/predicates_test.go index 949d67dd4..37f2e478c 100644 --- a/chain/events/state/predicates_test.go +++ b/chain/events/state/predicates_test.go @@ -5,17 +5,12 @@ import ( "context" "testing" - test "github.com/filecoin-project/lotus/chain/events/state/mock" - - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - - "github.com/filecoin-project/go-bitfield" - "github.com/ipfs/go-cid" cbornode "github.com/ipfs/go-ipld-cbor" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" @@ -26,6 +21,8 @@ import ( bstore "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + test "github.com/filecoin-project/lotus/chain/events/state/mock" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/tscache.go b/chain/events/tscache.go index 033c72a22..ed19a5f41 100644 --- a/chain/events/tscache.go +++ b/chain/events/tscache.go @@ -4,9 +4,10 @@ import ( "context" "sync" - "github.com/filecoin-project/go-state-types/abi" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/tscache_test.go b/chain/events/tscache_test.go index dad59f185..74fa8656a 100644 --- a/chain/events/tscache_test.go +++ b/chain/events/tscache_test.go @@ -5,12 +5,13 @@ import ( "context" "testing" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/crypto" "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/events/utils.go b/chain/events/utils.go index 0bfb58e0a..ac8d02009 100644 --- a/chain/events/utils.go +++ b/chain/events/utils.go @@ -3,10 +3,9 @@ package events import ( "context" - "github.com/filecoin-project/lotus/chain/stmgr" - "golang.org/x/xerrors" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/exchange/cbor_gen.go b/chain/exchange/cbor_gen.go index 9c7f68ab8..d1eb271e9 100644 --- a/chain/exchange/cbor_gen.go +++ b/chain/exchange/cbor_gen.go @@ -8,10 +8,11 @@ import ( "math" "sort" - types "github.com/filecoin-project/lotus/chain/types" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + types "github.com/filecoin-project/lotus/chain/types" ) var _ = xerrors.Errorf diff --git a/chain/exchange/client.go b/chain/exchange/client.go index 2c5b39b94..88c36aba3 100644 --- a/chain/exchange/client.go +++ b/chain/exchange/client.go @@ -10,7 +10,6 @@ import ( "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" - "go.opencensus.io/trace" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/chain/exchange/protocol.go b/chain/exchange/protocol.go index 2df9dc959..48080173c 100644 --- a/chain/exchange/protocol.go +++ b/chain/exchange/protocol.go @@ -3,13 +3,12 @@ package exchange import ( "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/store" - "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/exchange/server.go b/chain/exchange/server.go index 37d49d7bc..c1acb3f61 100644 --- a/chain/exchange/server.go +++ b/chain/exchange/server.go @@ -6,6 +6,8 @@ import ( "fmt" "time" + "github.com/ipfs/go-cid" + inet "github.com/libp2p/go-libp2p-core/network" "go.opencensus.io/trace" "golang.org/x/xerrors" @@ -13,9 +15,6 @@ import ( "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" - - "github.com/ipfs/go-cid" - inet "github.com/libp2p/go-libp2p-core/network" ) // server implements exchange.Server. It services requests for the diff --git a/chain/gen/gen.go b/chain/gen/gen.go index cde414fec..bfaacefc8 100644 --- a/chain/gen/gen.go +++ b/chain/gen/gen.go @@ -9,16 +9,6 @@ import ( "sync/atomic" "time" - proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" - - "github.com/filecoin-project/lotus/chain/rand" - - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" "github.com/google/uuid" "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" @@ -29,6 +19,13 @@ import ( "github.com/ipld/go-car" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" @@ -36,6 +33,7 @@ import ( "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/consensus/filcns" genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis" + "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/gen/genesis/f00_system.go b/chain/gen/genesis/f00_system.go index 527701f17..82f70f196 100644 --- a/chain/gen/genesis/f00_system.go +++ b/chain/gen/genesis/f00_system.go @@ -4,23 +4,18 @@ import ( "context" "github.com/ipfs/go-cid" - - systemtypes "github.com/filecoin-project/go-state-types/builtin/v8/system" - - "github.com/filecoin-project/go-state-types/manifest" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - + cbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/system" - - cbor "github.com/ipfs/go-ipld-cbor" + systemtypes "github.com/filecoin-project/go-state-types/builtin/v8/system" + "github.com/filecoin-project/go-state-types/manifest" bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/system" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/f01_init.go b/chain/gen/genesis/f01_init.go index f1df7ae2a..b020f5a5f 100644 --- a/chain/gen/genesis/f01_init.go +++ b/chain/gen/genesis/f01_init.go @@ -5,23 +5,19 @@ import ( "encoding/json" "fmt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" - - "github.com/filecoin-project/lotus/chain/actors" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/specs-actors/actors/util/adt" - cbor "github.com/ipfs/go-ipld-cbor" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/specs-actors/actors/util/adt" + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" + init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/genesis" ) diff --git a/chain/gen/genesis/f02_reward.go b/chain/gen/genesis/f02_reward.go index e4d6aa32a..2fd7709b6 100644 --- a/chain/gen/genesis/f02_reward.go +++ b/chain/gen/genesis/f02_reward.go @@ -3,18 +3,16 @@ package genesis import ( "context" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/reward" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/filecoin-project/go-state-types/big" - cbor "github.com/ipfs/go-ipld-cbor" - bstore "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/reward" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/f03_cron.go b/chain/gen/genesis/f03_cron.go index fad5e6fa6..1b24ff7e9 100644 --- a/chain/gen/genesis/f03_cron.go +++ b/chain/gen/genesis/f03_cron.go @@ -3,16 +3,15 @@ package genesis import ( "context" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/cron" - cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-state-types/big" + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/cron" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/f04_power.go b/chain/gen/genesis/f04_power.go index 35cd5f87b..7efa27733 100644 --- a/chain/gen/genesis/f04_power.go +++ b/chain/gen/genesis/f04_power.go @@ -3,17 +3,15 @@ package genesis import ( "context" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors/builtin/power" - - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/specs-actors/actors/util/adt" - cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/specs-actors/actors/util/adt" + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/power" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/f05_market.go b/chain/gen/genesis/f05_market.go index 045842cde..880b02700 100644 --- a/chain/gen/genesis/f05_market.go +++ b/chain/gen/genesis/f05_market.go @@ -3,16 +3,15 @@ package genesis import ( "context" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-state-types/big" + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/f06_vreg.go b/chain/gen/genesis/f06_vreg.go index d93b01a4f..07e175774 100644 --- a/chain/gen/genesis/f06_vreg.go +++ b/chain/gen/genesis/f06_vreg.go @@ -3,19 +3,16 @@ package genesis import ( "context" - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" - - "github.com/filecoin-project/lotus/chain/actors" - - "github.com/filecoin-project/go-address" cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/specs-actors/actors/util/adt" bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/gen/genesis/genesis.go b/chain/gen/genesis/genesis.go index 138437b78..6304fb7f8 100644 --- a/chain/gen/genesis/genesis.go +++ b/chain/gen/genesis/genesis.go @@ -6,38 +6,6 @@ import ( "encoding/json" "fmt" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - "github.com/filecoin-project/lotus/node/bundle" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" - verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" - adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" - - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" - - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/account" - - "github.com/filecoin-project/lotus/chain/actors" - - "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" - - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - - "github.com/filecoin-project/lotus/chain/actors/builtin/power" - - "github.com/filecoin-project/lotus/chain/actors/builtin/cron" - - init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" - "github.com/filecoin-project/lotus/chain/actors/builtin/reward" - - "github.com/filecoin-project/lotus/chain/actors/builtin/system" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/lotus/journal" - "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" cbor "github.com/ipfs/go-ipld-cbor" @@ -45,19 +13,37 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" + verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" + adt0 "github.com/filecoin-project/specs-actors/actors/util/adt" bstore "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/account" + "github.com/filecoin-project/lotus/chain/actors/builtin/cron" + init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" + "github.com/filecoin-project/lotus/chain/actors/builtin/power" + "github.com/filecoin-project/lotus/chain/actors/builtin/reward" + "github.com/filecoin-project/lotus/chain/actors/builtin/system" + "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/genesis" + "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/lib/sigs" + "github.com/filecoin-project/lotus/node/bundle" ) const AccountStart = 100 diff --git a/chain/gen/genesis/miners.go b/chain/gen/genesis/miners.go index 542111a62..ab01fe80e 100644 --- a/chain/gen/genesis/miners.go +++ b/chain/gen/genesis/miners.go @@ -6,47 +6,37 @@ import ( "fmt" "math/rand" - "github.com/filecoin-project/lotus/chain/wallet" - - cborutil "github.com/filecoin-project/go-cbor-util" - - "github.com/filecoin-project/lotus/lib/sigs" - - smoothing0 "github.com/filecoin-project/specs-actors/actors/util/smoothing" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" - - runtime7 "github.com/filecoin-project/specs-actors/v7/actors/runtime" - - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + builtintypes "github.com/filecoin-project/go-state-types/builtin" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" + miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" power0 "github.com/filecoin-project/specs-actors/actors/builtin/power" reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" + smoothing0 "github.com/filecoin-project/specs-actors/actors/util/smoothing" market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" reward2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/reward" market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market" power4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/power" reward4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/reward" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" + runtime7 "github.com/filecoin-project/specs-actors/v7/actors/runtime" - builtintypes "github.com/filecoin-project/go-state-types/builtin" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/builtin/power" @@ -57,7 +47,9 @@ import ( "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" + "github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/genesis" + "github.com/filecoin-project/lotus/lib/sigs" ) func MinerAddress(genesisIndex uint64) address.Address { diff --git a/chain/gen/genesis/util.go b/chain/gen/genesis/util.go index 1f576c8a4..beca1183c 100644 --- a/chain/gen/genesis/util.go +++ b/chain/gen/genesis/util.go @@ -3,11 +3,12 @@ package genesis import ( "context" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" diff --git a/chain/gen/slashfilter/slashfilter.go b/chain/gen/slashfilter/slashfilter.go index de3af5825..986586267 100644 --- a/chain/gen/slashfilter/slashfilter.go +++ b/chain/gen/slashfilter/slashfilter.go @@ -4,15 +4,14 @@ import ( "context" "fmt" - "github.com/filecoin-project/lotus/build" - - "golang.org/x/xerrors" - "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" + "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/market/fundmanager.go b/chain/market/fundmanager.go index 53afa1343..7b6b86719 100644 --- a/chain/market/fundmanager.go +++ b/chain/market/fundmanager.go @@ -5,21 +5,23 @@ import ( "fmt" "sync" + "github.com/ipfs/go-cid" + "github.com/ipfs/go-datastore" + logging "github.com/ipfs/go-log/v2" + "go.uber.org/fx" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/builtin/v8/market" + "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/node/impl/full" "github.com/filecoin-project/lotus/node/modules/dtypes" - "github.com/ipfs/go-cid" - "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log/v2" - "go.uber.org/fx" - "golang.org/x/xerrors" ) var log = logging.Logger("market_adapter") diff --git a/chain/market/fundmanager_test.go b/chain/market/fundmanager_test.go index 4dcf3b66c..17d36325a 100644 --- a/chain/market/fundmanager_test.go +++ b/chain/market/fundmanager_test.go @@ -8,19 +8,20 @@ import ( "testing" "time" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/chain/wallet" - tutils "github.com/filecoin-project/specs-actors/v2/support/testing" "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" + tutils "github.com/filecoin-project/specs-actors/v2/support/testing" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" ) // TestFundManagerBasic verifies that the basic fund manager operations work diff --git a/chain/market/store.go b/chain/market/store.go index 9818b1d80..ece1248f6 100644 --- a/chain/market/store.go +++ b/chain/market/store.go @@ -4,12 +4,12 @@ import ( "bytes" "context" - cborrpc "github.com/filecoin-project/go-cbor-util" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" dsq "github.com/ipfs/go-datastore/query" "github.com/filecoin-project/go-address" + cborrpc "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/lotus/node/modules/dtypes" ) diff --git a/chain/messagepool/check.go b/chain/messagepool/check.go index 92cfb458a..b1e2a2778 100644 --- a/chain/messagepool/check.go +++ b/chain/messagepool/check.go @@ -10,6 +10,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" diff --git a/chain/messagepool/config.go b/chain/messagepool/config.go index 3c07a8a0f..5b7e2c590 100644 --- a/chain/messagepool/config.go +++ b/chain/messagepool/config.go @@ -6,9 +6,10 @@ import ( "fmt" "time" + "github.com/ipfs/go-datastore" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/modules/dtypes" - "github.com/ipfs/go-datastore" ) var ( diff --git a/chain/messagepool/gasguess/guessgas.go b/chain/messagepool/gasguess/guessgas.go index 76ab39078..f502e84a6 100644 --- a/chain/messagepool/gasguess/guessgas.go +++ b/chain/messagepool/gasguess/guessgas.go @@ -6,14 +6,13 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/types" ) type ActorLookup func(context.Context, address.Address, types.TipSetKey) (*types.Actor, error) diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index 38c66c38d..3bc2babfd 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -11,15 +11,6 @@ import ( "sync" "time" - ffi "github.com/filecoin-project/filecoin-ffi" - - "github.com/minio/blake2b-simd" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/go-state-types/network" - lps "github.com/filecoin-project/pubsub" "github.com/hashicorp/go-multierror" lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" @@ -28,9 +19,17 @@ import ( "github.com/ipfs/go-datastore/query" logging "github.com/ipfs/go-log/v2" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/minio/blake2b-simd" + "github.com/raulk/clock" "golang.org/x/xerrors" + ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + lps "github.com/filecoin-project/pubsub" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" @@ -42,8 +41,6 @@ import ( "github.com/filecoin-project/lotus/lib/sigs" "github.com/filecoin-project/lotus/metrics" "github.com/filecoin-project/lotus/node/modules/dtypes" - - "github.com/raulk/clock" ) var log = logging.Logger("messagepool") diff --git a/chain/messagepool/messagepool_test.go b/chain/messagepool/messagepool_test.go index 4916fc71e..015ca69aa 100644 --- a/chain/messagepool/messagepool_test.go +++ b/chain/messagepool/messagepool_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/crypto" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/assert" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/crypto" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" "github.com/filecoin-project/lotus/api" diff --git a/chain/messagepool/provider.go b/chain/messagepool/provider.go index 9dcff2b33..5618ec603 100644 --- a/chain/messagepool/provider.go +++ b/chain/messagepool/provider.go @@ -9,6 +9,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/chain/messagesigner" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/chain/messagepool/pruning.go b/chain/messagepool/pruning.go index d405afb65..24d7fee56 100644 --- a/chain/messagepool/pruning.go +++ b/chain/messagepool/pruning.go @@ -5,10 +5,12 @@ import ( "sort" "time" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/chain/types" ) func (mp *MessagePool) pruneExcessMessages() error { diff --git a/chain/messagepool/repub.go b/chain/messagepool/repub.go index d92b5bd58..c4f1b26e3 100644 --- a/chain/messagepool/repub.go +++ b/chain/messagepool/repub.go @@ -5,13 +5,14 @@ import ( "sort" "time" + "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/messagepool/gasguess" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" ) const repubMsgLimit = 30 diff --git a/chain/messagepool/selection.go b/chain/messagepool/selection.go index 633e9b23f..0d93f2af9 100644 --- a/chain/messagepool/selection.go +++ b/chain/messagepool/selection.go @@ -8,13 +8,11 @@ import ( "time" cbg "github.com/whyrusleeping/cbor-gen" - - "github.com/filecoin-project/go-state-types/crypto" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" tbig "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/messagepool/gasguess" diff --git a/chain/messagepool/selection_test.go b/chain/messagepool/selection_test.go index e97d5208e..7c4e21913 100644 --- a/chain/messagepool/selection_test.go +++ b/chain/messagepool/selection_test.go @@ -14,25 +14,22 @@ import ( "sort" "testing" - "github.com/filecoin-project/go-state-types/crypto" - - cbg "github.com/whyrusleeping/cbor-gen" - - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" + cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/crypto" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/messagepool/gasguess" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" "github.com/filecoin-project/lotus/chain/wallet" - - "github.com/filecoin-project/lotus/api" _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" ) diff --git a/chain/messagesigner/messagesigner_test.go b/chain/messagesigner/messagesigner_test.go index 00a09fc95..dfae237bf 100644 --- a/chain/messagesigner/messagesigner_test.go +++ b/chain/messagesigner/messagesigner_test.go @@ -6,18 +6,15 @@ import ( "sync" "testing" - "golang.org/x/xerrors" - - "github.com/filecoin-project/lotus/chain/wallet" - - "github.com/stretchr/testify/require" - + "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-datastore" + "github.com/filecoin-project/lotus/chain/wallet" ) type mockMpool struct { diff --git a/chain/rand/rand.go b/chain/rand/rand.go index 12a993404..c35280ab5 100644 --- a/chain/rand/rand.go +++ b/chain/rand/rand.go @@ -4,19 +4,17 @@ import ( "context" "encoding/binary" - "github.com/filecoin-project/go-state-types/network" - - logging "github.com/ipfs/go-log/v2" - - "github.com/filecoin-project/lotus/chain/beacon" - "github.com/ipfs/go-cid" + logging "github.com/ipfs/go-log/v2" "github.com/minio/blake2b-simd" "go.opencensus.io/trace" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + + "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" diff --git a/chain/rand/rand_test.go b/chain/rand/rand_test.go index b5e2482b7..e85d15444 100644 --- a/chain/rand/rand_test.go +++ b/chain/rand/rand_test.go @@ -5,20 +5,17 @@ import ( "context" "testing" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - "github.com/filecoin-project/lotus/chain/stmgr" - - "github.com/filecoin-project/lotus/chain/rand" - "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/chain/actors/policy" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/rand" + "github.com/filecoin-project/lotus/chain/stmgr" ) func init() { diff --git a/chain/state/statetree.go b/chain/state/statetree.go index 7d6876c3c..970ac3c72 100644 --- a/chain/state/statetree.go +++ b/chain/state/statetree.go @@ -8,23 +8,22 @@ import ( "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log/v2" + cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/trace" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" - init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" - cbg "github.com/whyrusleeping/cbor-gen" - - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/types" - states0 "github.com/filecoin-project/specs-actors/actors/states" states2 "github.com/filecoin-project/specs-actors/v2/actors/states" states3 "github.com/filecoin-project/specs-actors/v3/actors/states" states4 "github.com/filecoin-project/specs-actors/v4/actors/states" states5 "github.com/filecoin-project/specs-actors/v5/actors/states" + + "github.com/filecoin-project/lotus/chain/actors/adt" + init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" + "github.com/filecoin-project/lotus/chain/types" ) var log = logging.Logger("statetree") diff --git a/chain/state/statetree_test.go b/chain/state/statetree_test.go index b08de8a3c..ce772a80b 100644 --- a/chain/state/statetree_test.go +++ b/chain/state/statetree_test.go @@ -6,12 +6,11 @@ import ( "fmt" "testing" - "github.com/filecoin-project/go-state-types/network" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" 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" "github.com/filecoin-project/lotus/build" diff --git a/chain/stmgr/actors.go b/chain/stmgr/actors.go index bfa04827e..c950f8d02 100644 --- a/chain/stmgr/actors.go +++ b/chain/stmgr/actors.go @@ -5,17 +5,17 @@ import ( "context" "os" + cid "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + miner_types "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" - cid "github.com/ipfs/go-cid" - miner_types "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/market" diff --git a/chain/stmgr/call.go b/chain/stmgr/call.go index 7e011d99f..29b44fda1 100644 --- a/chain/stmgr/call.go +++ b/chain/stmgr/call.go @@ -5,23 +5,20 @@ import ( "errors" "fmt" - "github.com/filecoin-project/lotus/blockstore" - + "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" - - "github.com/filecoin-project/lotus/chain/state" - - "github.com/filecoin-project/lotus/chain/rand" + "go.opencensus.io/trace" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/ipfs/go-cid" - "go.opencensus.io/trace" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/rand" + "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" ) diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go index 048ea7372..3c9493820 100644 --- a/chain/stmgr/forks.go +++ b/chain/stmgr/forks.go @@ -8,8 +8,6 @@ import ( "sync" "time" - "github.com/filecoin-project/specs-actors/v8/actors/migration/nv16" - "github.com/ipfs/go-cid" "golang.org/x/xerrors" @@ -17,6 +15,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/specs-actors/v8/actors/migration/nv16" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin" diff --git a/chain/stmgr/forks_test.go b/chain/stmgr/forks_test.go index e36f57ceb..56c236d74 100644 --- a/chain/stmgr/forks_test.go +++ b/chain/stmgr/forks_test.go @@ -19,7 +19,6 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/network" - builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" rt2 "github.com/filecoin-project/specs-actors/v2/actors/runtime" diff --git a/chain/stmgr/read.go b/chain/stmgr/read.go index bca32429b..4543f63b3 100644 --- a/chain/stmgr/read.go +++ b/chain/stmgr/read.go @@ -3,12 +3,12 @@ package stmgr import ( "context" - "golang.org/x/xerrors" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/stmgr/rpc/rpcstatemanager.go b/chain/stmgr/rpc/rpcstatemanager.go index dc719eb55..2c9893cc0 100644 --- a/chain/stmgr/rpc/rpcstatemanager.go +++ b/chain/stmgr/rpc/rpcstatemanager.go @@ -3,16 +3,17 @@ package rpcstmgr import ( "context" + cbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" - cbor "github.com/ipfs/go-ipld-cbor" ) type RPCStateManager struct { diff --git a/chain/stmgr/searchwait.go b/chain/stmgr/searchwait.go index 7e6de91d4..468f33db7 100644 --- a/chain/stmgr/searchwait.go +++ b/chain/stmgr/searchwait.go @@ -9,6 +9,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go index 9aaccfff3..2560c9ee6 100644 --- a/chain/stmgr/stmgr.go +++ b/chain/stmgr/stmgr.go @@ -4,13 +4,6 @@ import ( "context" "sync" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/specs-actors/v8/actors/migration/nv16" - - "github.com/filecoin-project/lotus/chain/rand" - - "github.com/filecoin-project/lotus/chain/beacon" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log/v2" @@ -20,12 +13,16 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/specs-actors/v8/actors/migration/nv16" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/adt" _init "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/actors/policy" + "github.com/filecoin-project/lotus/chain/beacon" + "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/stmgr/supply.go b/chain/stmgr/supply.go index 7c55a1a0d..89708097e 100644 --- a/chain/stmgr/supply.go +++ b/chain/stmgr/supply.go @@ -10,7 +10,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig" "github.com/filecoin-project/lotus/api" diff --git a/chain/stmgr/tracers.go b/chain/stmgr/tracers.go index 6bcd7bc15..408205de0 100644 --- a/chain/stmgr/tracers.go +++ b/chain/stmgr/tracers.go @@ -3,10 +3,11 @@ package stmgr import ( "context" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" - "github.com/ipfs/go-cid" ) type ExecMonitor interface { diff --git a/chain/stmgr/utils.go b/chain/stmgr/utils.go index 61eb5fcb0..77a65f671 100644 --- a/chain/stmgr/utils.go +++ b/chain/stmgr/utils.go @@ -9,12 +9,12 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/go-state-types/manifest" - gstStore "github.com/filecoin-project/go-state-types/store" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/manifest" + gstStore "github.com/filecoin-project/go-state-types/store" + "github.com/filecoin-project/lotus/api" init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/actors/builtin/system" diff --git a/chain/store/basefee.go b/chain/store/basefee.go index 1d6b0760e..3b6af5c07 100644 --- a/chain/store/basefee.go +++ b/chain/store/basefee.go @@ -3,12 +3,14 @@ package store import ( "context" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) func ComputeNextBaseFee(baseFee types.BigInt, gasLimitUsed int64, noOfBlocks int, epoch abi.ChainEpoch) types.BigInt { diff --git a/chain/store/basefee_test.go b/chain/store/basefee_test.go index 58a465356..ea45a7673 100644 --- a/chain/store/basefee_test.go +++ b/chain/store/basefee_test.go @@ -6,9 +6,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/assert" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" - "github.com/stretchr/testify/assert" ) func TestBaseFee(t *testing.T) { diff --git a/chain/store/fts.go b/chain/store/fts.go index 0324938d7..477b2b0b0 100644 --- a/chain/store/fts.go +++ b/chain/store/fts.go @@ -1,8 +1,9 @@ package store import ( - "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/lotus/chain/types" ) // FullTipSet is an expanded version of the TipSet that contains all the blocks and messages diff --git a/chain/store/index.go b/chain/store/index.go index f5bbbd438..fe8f399ee 100644 --- a/chain/store/index.go +++ b/chain/store/index.go @@ -5,10 +5,12 @@ import ( "os" "strconv" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/types" lru "github.com/hashicorp/golang-lru" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/chain/types" ) var DefaultChainIndexCacheSize = 32 << 10 diff --git a/chain/store/index_test.go b/chain/store/index_test.go index 7b05dd068..24d5b66b3 100644 --- a/chain/store/index_test.go +++ b/chain/store/index_test.go @@ -6,15 +6,17 @@ import ( "context" "testing" + datastore "github.com/ipfs/go-datastore" + syncds "github.com/ipfs/go-datastore/sync" + "github.com/stretchr/testify/assert" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types/mock" - datastore "github.com/ipfs/go-datastore" - syncds "github.com/ipfs/go-datastore/sync" - "github.com/stretchr/testify/assert" ) func TestIndexSeeks(t *testing.T) { diff --git a/chain/store/messages.go b/chain/store/messages.go index 4dd3bfc1d..30bb80487 100644 --- a/chain/store/messages.go +++ b/chain/store/messages.go @@ -3,12 +3,11 @@ package store import ( "context" - "github.com/ipfs/go-cid" - "golang.org/x/xerrors" - block "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" cbg "github.com/whyrusleeping/cbor-gen" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" diff --git a/chain/store/snapshot.go b/chain/store/snapshot.go index 07d086e1f..b5a457b71 100644 --- a/chain/store/snapshot.go +++ b/chain/store/snapshot.go @@ -13,6 +13,7 @@ import ( "golang.org/x/xerrors" "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/actors/builtin" diff --git a/chain/store/store.go b/chain/store/store.go index 9a0084f16..ff4a7201c 100644 --- a/chain/store/store.go +++ b/chain/store/store.go @@ -10,25 +10,6 @@ import ( "sync" "time" - "golang.org/x/sync/errgroup" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - - "github.com/filecoin-project/lotus/api" - bstore "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/journal" - "github.com/filecoin-project/lotus/metrics" - - "go.opencensus.io/stats" - "go.opencensus.io/trace" - "go.uber.org/multierr" - - "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/pubsub" lru "github.com/hashicorp/golang-lru" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" @@ -36,7 +17,23 @@ import ( "github.com/ipfs/go-datastore/query" cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log/v2" + "go.opencensus.io/stats" + "go.opencensus.io/trace" + "go.uber.org/multierr" + "golang.org/x/sync/errgroup" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/pubsub" + + "github.com/filecoin-project/lotus/api" + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/journal" + "github.com/filecoin-project/lotus/metrics" ) var log = logging.Logger("chainstore") diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go index 2a8628634..7c4df3c9a 100644 --- a/chain/sub/incoming.go +++ b/chain/sub/incoming.go @@ -7,18 +7,6 @@ import ( "sync" "time" - address "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-legs/dtsync" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain" - "github.com/filecoin-project/lotus/chain/consensus" - "github.com/filecoin-project/lotus/chain/messagepool" - "github.com/filecoin-project/lotus/chain/store" - "github.com/filecoin-project/lotus/chain/sub/ratelimit" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/metrics" - "github.com/filecoin-project/lotus/node/impl/client" - "github.com/filecoin-project/lotus/node/impl/full" lru "github.com/hashicorp/golang-lru" blocks "github.com/ipfs/go-block-format" bserv "github.com/ipfs/go-blockservice" @@ -30,6 +18,20 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/tag" "golang.org/x/xerrors" + + address "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-legs/dtsync" + + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/consensus" + "github.com/filecoin-project/lotus/chain/messagepool" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/sub/ratelimit" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/metrics" + "github.com/filecoin-project/lotus/node/impl/client" + "github.com/filecoin-project/lotus/node/impl/full" ) var log = logging.Logger("sub") diff --git a/chain/sub/incoming_test.go b/chain/sub/incoming_test.go index f90dcb373..7bd98d20d 100644 --- a/chain/sub/incoming_test.go +++ b/chain/sub/incoming_test.go @@ -6,16 +6,18 @@ import ( "context" "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-legs/dtsync" - "github.com/filecoin-project/lotus/api/mocks" - "github.com/filecoin-project/lotus/chain/types" "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" pb "github.com/libp2p/go-libp2p-pubsub/pb" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-legs/dtsync" + + "github.com/filecoin-project/lotus/api/mocks" + "github.com/filecoin-project/lotus/chain/types" ) type getter struct { diff --git a/chain/sync.go b/chain/sync.go index 28b324211..0ac998ab3 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -9,12 +9,7 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/chain/consensus" - - "github.com/filecoin-project/lotus/node/modules/dtypes" - "github.com/Gurpartap/async" - "github.com/filecoin-project/pubsub" "github.com/hashicorp/go-multierror" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" @@ -28,6 +23,11 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/pubsub" + + "github.com/filecoin-project/lotus/chain/consensus" + "github.com/filecoin-project/lotus/node/modules/dtypes" + // named msgarray here to make it clear that these are the types used by // messages, regardless of specs-actors version. blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" diff --git a/chain/sync_manager.go b/chain/sync_manager.go index 685e05df6..82de35add 100644 --- a/chain/sync_manager.go +++ b/chain/sync_manager.go @@ -9,11 +9,12 @@ import ( "sync" "time" + peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" - - peer "github.com/libp2p/go-libp2p-core/peer" ) var ( diff --git a/chain/sync_manager_test.go b/chain/sync_manager_test.go index 50fedeed6..b3069c3fb 100644 --- a/chain/sync_manager_test.go +++ b/chain/sync_manager_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" - "github.com/stretchr/testify/require" ) func init() { diff --git a/chain/sync_test.go b/chain/sync_test.go index d8c68b132..01fcf0441 100644 --- a/chain/sync_test.go +++ b/chain/sync_test.go @@ -8,13 +8,7 @@ import ( "testing" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/stmgr" - "github.com/ipfs/go-cid" - ds "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/peer" @@ -23,6 +17,8 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" + prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" @@ -30,6 +26,7 @@ import ( "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/gen/slashfilter" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" mocktypes "github.com/filecoin-project/lotus/chain/types/mock" diff --git a/chain/types/bigint_test.go b/chain/types/bigint_test.go index be03d5c39..595bb8e0b 100644 --- a/chain/types/bigint_test.go +++ b/chain/types/bigint_test.go @@ -10,7 +10,6 @@ import ( "time" "github.com/docker/go-units" - "github.com/stretchr/testify/assert" ) diff --git a/chain/types/blockheader.go b/chain/types/blockheader.go index c28a17abb..b700c9699 100644 --- a/chain/types/blockheader.go +++ b/chain/types/blockheader.go @@ -4,18 +4,15 @@ import ( "bytes" "math/big" - "github.com/filecoin-project/go-state-types/proof" - - "github.com/minio/blake2b-simd" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/crypto" - block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" + "github.com/minio/blake2b-simd" xerrors "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/lotus/build" ) diff --git a/chain/types/blockheader_test.go b/chain/types/blockheader_test.go index 773cf27b2..80c97482c 100644 --- a/chain/types/blockheader_test.go +++ b/chain/types/blockheader_test.go @@ -8,14 +8,13 @@ import ( "reflect" "testing" - prooftypes "github.com/filecoin-project/go-state-types/proof" - cid "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" + prooftypes "github.com/filecoin-project/go-state-types/proof" ) func testBlockHeader(t testing.TB) *BlockHeader { diff --git a/chain/types/cbor_gen.go b/chain/types/cbor_gen.go index 79ff5d19c..78a3449ee 100644 --- a/chain/types/cbor_gen.go +++ b/chain/types/cbor_gen.go @@ -8,13 +8,14 @@ import ( "math" "sort" + cid "github.com/ipfs/go-cid" + cbg "github.com/whyrusleeping/cbor-gen" + xerrors "golang.org/x/xerrors" + abi "github.com/filecoin-project/go-state-types/abi" crypto "github.com/filecoin-project/go-state-types/crypto" exitcode "github.com/filecoin-project/go-state-types/exitcode" proof "github.com/filecoin-project/go-state-types/proof" - cid "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" - xerrors "golang.org/x/xerrors" ) var _ = xerrors.Errorf diff --git a/chain/types/electionproof.go b/chain/types/electionproof.go index b8879b27c..6f59c7713 100644 --- a/chain/types/electionproof.go +++ b/chain/types/electionproof.go @@ -3,8 +3,9 @@ package types import ( "math/big" - "github.com/filecoin-project/lotus/build" "github.com/minio/blake2b-simd" + + "github.com/filecoin-project/lotus/build" ) type ElectionProof struct { diff --git a/chain/types/message.go b/chain/types/message.go index 4f6bb7822..dc9accc43 100644 --- a/chain/types/message.go +++ b/chain/types/message.go @@ -5,16 +5,16 @@ import ( "encoding/json" "fmt" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/build" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" xerrors "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/network" + + "github.com/filecoin-project/lotus/build" ) const MessageVersion = 0 diff --git a/chain/types/mock/chain.go b/chain/types/mock/chain.go index 9a911c987..dcbcd8536 100644 --- a/chain/types/mock/chain.go +++ b/chain/types/mock/chain.go @@ -5,10 +5,11 @@ import ( "fmt" "math/rand" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/ipfs/go-cid" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" diff --git a/chain/types/signedmessage.go b/chain/types/signedmessage.go index c539ac240..168531714 100644 --- a/chain/types/signedmessage.go +++ b/chain/types/signedmessage.go @@ -4,10 +4,11 @@ import ( "bytes" "encoding/json" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/crypto" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/crypto" ) func (sm *SignedMessage) ToStorageBlock() (block.Block, error) { diff --git a/chain/types/tipset.go b/chain/types/tipset.go index 07eff3734..9c2fc4d79 100644 --- a/chain/types/tipset.go +++ b/chain/types/tipset.go @@ -7,12 +7,13 @@ import ( "io" "sort" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/minio/blake2b-simd" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" ) var log = logging.Logger("types") diff --git a/chain/types/tipset_key.go b/chain/types/tipset_key.go index 9f9887796..b69774108 100644 --- a/chain/types/tipset_key.go +++ b/chain/types/tipset_key.go @@ -5,8 +5,9 @@ import ( "encoding/json" "strings" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/go-state-types/abi" ) var EmptyTSK = TipSetKey{} diff --git a/chain/types/vmcontext.go b/chain/types/vmcontext.go index d0ce42c0f..a8fd907a2 100644 --- a/chain/types/vmcontext.go +++ b/chain/types/vmcontext.go @@ -1,11 +1,12 @@ package types import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/chain/actors/aerrors" - cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" + + "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/chain/actors/aerrors" ) type Storage interface { diff --git a/chain/types_test.go b/chain/types_test.go index bf5dff4cc..53210e180 100644 --- a/chain/types_test.go +++ b/chain/types_test.go @@ -6,9 +6,9 @@ import ( "encoding/json" "testing" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/vectors/gen/main.go b/chain/vectors/gen/main.go index 757227d0d..fbc96d2c3 100644 --- a/chain/vectors/gen/main.go +++ b/chain/vectors/gen/main.go @@ -7,17 +7,17 @@ import ( "math/rand" "os" - "github.com/filecoin-project/go-address" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" "github.com/filecoin-project/lotus/chain/vectors" "github.com/filecoin-project/lotus/chain/wallet" - _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" ) diff --git a/chain/vectors/vector_types.go b/chain/vectors/vector_types.go index 7e014fb77..3251fde38 100644 --- a/chain/vectors/vector_types.go +++ b/chain/vectors/vector_types.go @@ -2,6 +2,7 @@ package vectors import ( "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/vm/burn_test.go b/chain/vm/burn_test.go index 8690b7ca1..a9042ca14 100644 --- a/chain/vm/burn_test.go +++ b/chain/vm/burn_test.go @@ -5,8 +5,9 @@ import ( "fmt" "testing" - "github.com/filecoin-project/lotus/chain/types" "github.com/stretchr/testify/assert" + + "github.com/filecoin-project/lotus/chain/types" ) func TestGasBurn(t *testing.T) { diff --git a/chain/vm/cbor_gen.go b/chain/vm/cbor_gen.go index 0e1677c95..64b623f63 100644 --- a/chain/vm/cbor_gen.go +++ b/chain/vm/cbor_gen.go @@ -8,10 +8,11 @@ import ( "math" "sort" - types "github.com/filecoin-project/lotus/chain/types" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + types "github.com/filecoin-project/lotus/chain/types" ) var _ = xerrors.Errorf diff --git a/chain/vm/fvm.go b/chain/vm/fvm.go index 64730e784..1ea87bdf9 100644 --- a/chain/vm/fvm.go +++ b/chain/vm/fvm.go @@ -8,30 +8,25 @@ import ( "time" "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/chain/actors/aerrors" - "github.com/filecoin-project/lotus/chain/actors/policy" - - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/state" cbor "github.com/ipfs/go-ipld-cbor" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/lotus/lib/sigs" - "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/blockstore" - ffi "github.com/filecoin-project/filecoin-ffi" ffi_cgo "github.com/filecoin-project/filecoin-ffi/cgo" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/aerrors" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/actors/policy" + "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sigs" ) var _ Interface = (*FVM)(nil) diff --git a/chain/vm/gas.go b/chain/vm/gas.go index 5beaae40b..ca6e5571a 100644 --- a/chain/vm/gas.go +++ b/chain/vm/gas.go @@ -3,14 +3,14 @@ package vm import ( "fmt" - vmr "github.com/filecoin-project/specs-actors/v7/actors/runtime" - proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/ipfs/go-cid" "github.com/filecoin-project/go-address" addr "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/ipfs/go-cid" + vmr "github.com/filecoin-project/specs-actors/v7/actors/runtime" + proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" "github.com/filecoin-project/lotus/build" ) diff --git a/chain/vm/gas_v0.go b/chain/vm/gas_v0.go index 7e0ece769..7a144fc26 100644 --- a/chain/vm/gas_v0.go +++ b/chain/vm/gas_v0.go @@ -3,11 +3,10 @@ package vm import ( "fmt" - proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" + proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" "github.com/filecoin-project/lotus/chain/actors/builtin" ) diff --git a/chain/vm/invoker.go b/chain/vm/invoker.go index 01ff14480..ad04639e5 100644 --- a/chain/vm/invoker.go +++ b/chain/vm/invoker.go @@ -8,22 +8,19 @@ import ( "runtime" "strings" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - vmr "github.com/filecoin-project/specs-actors/v7/actors/runtime" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" rtt "github.com/filecoin-project/go-state-types/rt" + vmr "github.com/filecoin-project/specs-actors/v7/actors/runtime" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/chain/vm/invoker_test.go b/chain/vm/invoker_test.go index 1b6fcc482..8357da8af 100644 --- a/chain/vm/invoker_test.go +++ b/chain/vm/invoker_test.go @@ -6,17 +6,15 @@ import ( "io" "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/network" - cbor "github.com/ipfs/go-ipld-cbor" "github.com/stretchr/testify/assert" cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" - + "github.com/filecoin-project/go-state-types/network" runtime2 "github.com/filecoin-project/specs-actors/v2/actors/runtime" "github.com/filecoin-project/lotus/chain/actors" diff --git a/chain/vm/mkactor.go b/chain/vm/mkactor.go index acdbf9ad4..7e27ee811 100644 --- a/chain/vm/mkactor.go +++ b/chain/vm/mkactor.go @@ -3,17 +3,13 @@ package vm import ( "context" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/build" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/lotus/chain/actors" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" @@ -22,7 +18,8 @@ import ( builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" - "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/aerrors" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/account" diff --git a/chain/vm/runtime.go b/chain/vm/runtime.go index 497d4f6d9..ff8819688 100644 --- a/chain/vm/runtime.go +++ b/chain/vm/runtime.go @@ -9,6 +9,11 @@ import ( gruntime "runtime" "time" + "github.com/ipfs/go-cid" + ipldcbor "github.com/ipfs/go-ipld-cbor" + "go.opencensus.io/trace" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" @@ -23,10 +28,6 @@ import ( rt5 "github.com/filecoin-project/specs-actors/v5/actors/runtime" rt6 "github.com/filecoin-project/specs-actors/v6/actors/runtime" rt7 "github.com/filecoin-project/specs-actors/v7/actors/runtime" - "github.com/ipfs/go-cid" - ipldcbor "github.com/ipfs/go-ipld-cbor" - "go.opencensus.io/trace" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go index 674a48070..8533e29eb 100644 --- a/chain/vm/syscalls.go +++ b/chain/vm/syscalls.go @@ -17,6 +17,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" + runtime7 "github.com/filecoin-project/specs-actors/v7/actors/runtime" + proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" @@ -25,9 +28,6 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/lib/sigs" - - runtime7 "github.com/filecoin-project/specs-actors/v7/actors/runtime" - proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" ) func init() { diff --git a/chain/vm/vm.go b/chain/vm/vm.go index 26d3a82b3..d016914dd 100644 --- a/chain/vm/vm.go +++ b/chain/vm/vm.go @@ -7,9 +7,6 @@ import ( "sync/atomic" "time" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/metrics" - block "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" @@ -23,19 +20,21 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + builtin_types "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" - builtin_types "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/account" "github.com/filecoin-project/lotus/chain/actors/builtin/reward" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/metrics" ) const MaxCallDepth = 4096 diff --git a/chain/vm/vmi.go b/chain/vm/vmi.go index f7fc366ee..0ece44ace 100644 --- a/chain/vm/vmi.go +++ b/chain/vm/vmi.go @@ -4,9 +4,11 @@ import ( "context" "os" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" + + "github.com/filecoin-project/go-state-types/network" + + "github.com/filecoin-project/lotus/chain/types" ) type Interface interface { diff --git a/chain/wallet/wallet.go b/chain/wallet/wallet.go index cbe78a9e8..91d7e3d54 100644 --- a/chain/wallet/wallet.go +++ b/chain/wallet/wallet.go @@ -6,11 +6,12 @@ import ( "strings" "sync" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/crypto" logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/lib/sigs" diff --git a/chain/wallet/wallet_test.go b/chain/wallet/wallet_test.go index f07a6278c..d9dac3356 100644 --- a/chain/wallet/wallet_test.go +++ b/chain/wallet/wallet_test.go @@ -5,8 +5,9 @@ import ( "context" "testing" - "github.com/filecoin-project/lotus/chain/types" "github.com/stretchr/testify/assert" + + "github.com/filecoin-project/lotus/chain/types" ) func TestWallet(t *testing.T) { diff --git a/cli/chain.go b/cli/chain.go index 00b9a73c6..856751ed7 100644 --- a/cli/chain.go +++ b/cli/chain.go @@ -16,6 +16,11 @@ import ( "strings" "time" + cid "github.com/ipfs/go-cid" + "github.com/urfave/cli/v2" + cbg "github.com/whyrusleeping/cbor-gen" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" @@ -26,10 +31,6 @@ import ( "github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/specs-actors/actors/builtin/power" "github.com/filecoin-project/specs-actors/actors/util/adt" - cid "github.com/ipfs/go-cid" - "github.com/urfave/cli/v2" - cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api" diff --git a/cli/chain_test.go b/cli/chain_test.go index fa7d9d0bb..41f0525b2 100644 --- a/cli/chain_test.go +++ b/cli/chain_test.go @@ -10,15 +10,17 @@ import ( "strings" "testing" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/api" - types "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/chain/types/mock" - "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/golang/mock/gomock" cid "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "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/mock" ) func TestChainHead(t *testing.T) { diff --git a/cli/client.go b/cli/client.go index 6ad08a7e6..5b5f56d66 100644 --- a/cli/client.go +++ b/cli/client.go @@ -23,7 +23,6 @@ import ( "github.com/chzyer/readline" "github.com/docker/go-units" "github.com/fatih/color" - datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/ipfs/go-cid" "github.com/ipfs/go-cidutil/cidenc" "github.com/libp2p/go-libp2p-core/peer" @@ -31,14 +30,13 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - "github.com/filecoin-project/go-address" + datatransfer "github.com/filecoin-project/go-data-transfer" + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-fil-markets/storagemarket" - "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" diff --git a/cli/disputer.go b/cli/disputer.go index ceebeb939..adbdd919e 100644 --- a/cli/disputer.go +++ b/cli/disputer.go @@ -6,25 +6,21 @@ import ( "strconv" "time" - "github.com/filecoin-project/go-state-types/abi" - - "github.com/filecoin-project/go-address" - - "github.com/filecoin-project/lotus/chain/actors" - - miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner" - - "github.com/filecoin-project/go-state-types/big" - lapi "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/chain/types" - builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + logging "github.com/ipfs/go-log/v2" + "github.com/urfave/cli/v2" "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin" + miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner" + lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/store" - "github.com/urfave/cli/v2" + "github.com/filecoin-project/lotus/chain/types" ) var disputeLog = logging.Logger("disputer") diff --git a/cli/filplus.go b/cli/filplus.go index 24657c6b5..b3ebce6e9 100644 --- a/cli/filplus.go +++ b/cli/filplus.go @@ -6,15 +6,14 @@ import ( "encoding/hex" "fmt" - verifregtypes "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" - - "github.com/filecoin-project/go-state-types/big" - + cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + verifregtypes "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/blockstore" @@ -23,7 +22,6 @@ import ( "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" "github.com/filecoin-project/lotus/chain/types" - cbor "github.com/ipfs/go-ipld-cbor" ) var filplusCmd = &cli.Command{ diff --git a/cli/mocks_test.go b/cli/mocks_test.go index c9cccac08..e4489c5ee 100644 --- a/cli/mocks_test.go +++ b/cli/mocks_test.go @@ -4,10 +4,11 @@ import ( "bytes" "testing" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/mocks" "github.com/golang/mock/gomock" ucli "github.com/urfave/cli/v2" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/mocks" ) // newMockAppWithFullAPI returns a gomock-ed CLI app used for unit tests diff --git a/cli/mpool_manage.go b/cli/mpool_manage.go index 164a05842..d34455730 100644 --- a/cli/mpool_manage.go +++ b/cli/mpool_manage.go @@ -6,16 +6,18 @@ import ( "sort" "github.com/Kubuxu/imtui" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/big" - "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/gdamore/tcell/v2" cid "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/big" + + "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" ) var mpoolManage = &cli.Command{ diff --git a/cli/mpool_test.go b/cli/mpool_test.go index 2ddd85999..1533ef9e2 100644 --- a/cli/mpool_test.go +++ b/cli/mpool_test.go @@ -3,20 +3,21 @@ package cli import ( "context" + "encoding/json" "fmt" "testing" - "encoding/json" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" "github.com/filecoin-project/lotus/chain/wallet" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) func TestStat(t *testing.T) { diff --git a/cli/multisig.go b/cli/multisig.go index d9255f6e4..84803183e 100644 --- a/cli/multisig.go +++ b/cli/multisig.go @@ -10,18 +10,15 @@ import ( "strconv" "text/tabwriter" - cbg "github.com/whyrusleeping/cbor-gen" - - "github.com/filecoin-project/go-state-types/big" - - "github.com/filecoin-project/go-state-types/abi" - - "github.com/filecoin-project/go-address" cid "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" + cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" msig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" diff --git a/cli/net.go b/cli/net.go index 1c3fb5be7..5c9578616 100644 --- a/cli/net.go +++ b/cli/net.go @@ -13,13 +13,12 @@ import ( "github.com/dustin/go-humanize" "github.com/fatih/color" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" - "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" protocol "github.com/libp2p/go-libp2p-core/protocol" "github.com/multiformats/go-multiaddr" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" diff --git a/cli/params.go b/cli/params.go index 1aa6555c5..d391c1b85 100644 --- a/cli/params.go +++ b/cli/params.go @@ -2,10 +2,11 @@ package cli import ( "github.com/docker/go-units" - paramfetch "github.com/filecoin-project/go-paramfetch" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/lotus/build" ) diff --git a/cli/paych.go b/cli/paych.go index 33fcb2747..8277e3123 100644 --- a/cli/paych.go +++ b/cli/paych.go @@ -8,17 +8,16 @@ import ( "sort" "strings" - lapi "github.com/filecoin-project/lotus/api" - - "github.com/filecoin-project/go-state-types/builtin/v8/paych" - "github.com/filecoin-project/lotus/paychmgr" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/build" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" + + lapi "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" lpaych "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/paychmgr" ) var paychCmd = &cli.Command{ diff --git a/cli/send_test.go b/cli/send_test.go index a9829d4f3..571cb42b6 100644 --- a/cli/send_test.go +++ b/cli/send_test.go @@ -6,13 +6,15 @@ import ( "bytes" "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/api" - types "github.com/filecoin-project/lotus/chain/types" gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ucli "github.com/urfave/cli/v2" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api" + 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 a70abefb9..5cd763fc2 100644 --- a/cli/sending_ui.go +++ b/cli/sending_ui.go @@ -8,15 +8,17 @@ import ( "strings" "github.com/Kubuxu/imtui" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/build" - types "github.com/filecoin-project/lotus/chain/types" "github.com/gdamore/tcell/v2" cid "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + 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 8d131dfb1..287deb512 100644 --- a/cli/services.go +++ b/cli/services.go @@ -7,16 +7,18 @@ import ( "fmt" "reflect" + cid "github.com/ipfs/go-cid" + cbg "github.com/whyrusleeping/cbor-gen" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/consensus/filcns" types "github.com/filecoin-project/lotus/chain/types" - cid "github.com/ipfs/go-cid" - cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" ) //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 feebd58a1..a73fabe3c 100644 --- a/cli/services_send_test.go +++ b/cli/services_send_test.go @@ -7,14 +7,16 @@ import ( "fmt" "testing" + gomock "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" "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" - gomock "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) type markerKeyType struct{} diff --git a/cli/servicesmock_test.go b/cli/servicesmock_test.go index 5bae52a5e..11260ab08 100644 --- a/cli/servicesmock_test.go +++ b/cli/servicesmock_test.go @@ -8,12 +8,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + go_address "github.com/filecoin-project/go-address" abi "github.com/filecoin-project/go-state-types/abi" big "github.com/filecoin-project/go-state-types/big" + api "github.com/filecoin-project/lotus/api" types "github.com/filecoin-project/lotus/chain/types" - gomock "github.com/golang/mock/gomock" ) // MockServicesAPI is a mock of ServicesAPI interface. diff --git a/cli/state.go b/cli/state.go index e9c187582..e5ee1c899 100644 --- a/cli/state.go +++ b/cli/state.go @@ -18,18 +18,7 @@ import ( "text/tabwriter" "time" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/chain/actors" - - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - - "github.com/filecoin-project/lotus/api/v0api" - "github.com/fatih/color" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/multiformats/go-multiaddr" @@ -40,12 +29,18 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" diff --git a/cli/sync.go b/cli/sync.go index 0c4984379..2dddbab89 100644 --- a/cli/sync.go +++ b/cli/sync.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/go-state-types/abi" cid "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) var SyncCmd = &cli.Command{ diff --git a/cli/sync_test.go b/cli/sync_test.go index fd0d834bf..345338f75 100644 --- a/cli/sync_test.go +++ b/cli/sync_test.go @@ -7,12 +7,14 @@ import ( "testing" "time" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/mock" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) func TestSyncStatus(t *testing.T) { diff --git a/cli/wallet.go b/cli/wallet.go index be81a5887..4193138c3 100644 --- a/cli/wallet.go +++ b/cli/wallet.go @@ -10,10 +10,6 @@ import ( "os" "strings" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/build" - "github.com/urfave/cli/v2" "golang.org/x/xerrors" @@ -21,7 +17,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/lib/tablewriter" ) diff --git a/cli/wallet_test.go b/cli/wallet_test.go index f73937019..9a806266b 100644 --- a/cli/wallet_test.go +++ b/cli/wallet_test.go @@ -8,17 +8,19 @@ import ( "fmt" "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/lotus/api" - apitypes "github.com/filecoin-project/lotus/api/types" - types "github.com/filecoin-project/lotus/chain/types" "github.com/golang/mock/gomock" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/stretchr/testify/assert" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" + + "github.com/filecoin-project/lotus/api" + apitypes "github.com/filecoin-project/lotus/api/types" + types "github.com/filecoin-project/lotus/chain/types" ) func TestWalletNew(t *testing.T) { diff --git a/cmd/chain-noise/main.go b/cmd/chain-noise/main.go index 8106ce592..6f124fad7 100644 --- a/cmd/chain-noise/main.go +++ b/cmd/chain-noise/main.go @@ -7,13 +7,14 @@ import ( "os" "time" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - - "github.com/urfave/cli/v2" ) func main() { diff --git a/cmd/lotus-bench/caching_verifier.go b/cmd/lotus-bench/caching_verifier.go index 8cb0f7211..733b060c7 100644 --- a/cmd/lotus-bench/caching_verifier.go +++ b/cmd/lotus-bench/caching_verifier.go @@ -5,13 +5,14 @@ import ( "context" "errors" + "github.com/ipfs/go-datastore" + "github.com/minio/blake2b-simd" + cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-state-types/abi" prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/ipfs/go-datastore" - "github.com/minio/blake2b-simd" - cbg "github.com/whyrusleeping/cbor-gen" ) type cachingVerifier struct { diff --git a/cmd/lotus-bench/import.go b/cmd/lotus-bench/import.go index 18ce6c7ef..ef3c8312f 100644 --- a/cmd/lotus-bench/import.go +++ b/cmd/lotus-bench/import.go @@ -17,9 +17,19 @@ import ( "time" ocprom "contrib.go.opencensus.io/exporter/prometheus" + bdg "github.com/dgraph-io/badger/v2" "github.com/ipfs/go-cid" + "github.com/ipfs/go-datastore" + badger "github.com/ipfs/go-ds-badger2" + measure "github.com/ipfs/go-ds-measure" + metricsprometheus "github.com/ipfs/go-metrics-prometheus" + "github.com/ipld/go-car" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" @@ -30,23 +40,10 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" "github.com/filecoin-project/lotus/node/repo" - - "github.com/filecoin-project/go-state-types/abi" - metricsprometheus "github.com/ipfs/go-metrics-prometheus" - "github.com/ipld/go-car" - - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - - bdg "github.com/dgraph-io/badger/v2" - "github.com/ipfs/go-datastore" - badger "github.com/ipfs/go-ds-badger2" - measure "github.com/ipfs/go-ds-measure" - - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) type TipSetExec struct { diff --git a/cmd/lotus-bench/main.go b/cmd/lotus-bench/main.go index fc249cdec..10a3c6dc1 100644 --- a/cmd/lotus-bench/main.go +++ b/cmd/lotus-bench/main.go @@ -11,8 +11,6 @@ import ( "path/filepath" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - "github.com/docker/go-units" logging "github.com/ipfs/go-log/v2" "github.com/minio/blake2b-simd" @@ -23,16 +21,17 @@ import ( "github.com/filecoin-project/go-address" paramfetch "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/abi" - lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs" - "github.com/filecoin-project/lotus/extern/sector-storage/storiface" + prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" "github.com/filecoin-project/lotus/genesis" ) diff --git a/cmd/lotus-bench/simple.go b/cmd/lotus-bench/simple.go index 408381481..7454a3701 100644 --- a/cmd/lotus-bench/simple.go +++ b/cmd/lotus-bench/simple.go @@ -19,12 +19,13 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/abi" + prf "github.com/filecoin-project/specs-actors/actors/runtime/proof" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - prf "github.com/filecoin-project/specs-actors/actors/runtime/proof" - "github.com/filecoin-project/specs-storage/storage" ) var simpleCmd = &cli.Command{ diff --git a/cmd/lotus-fountain/main.go b/cmd/lotus-fountain/main.go index 7ac598d8e..059c248f6 100644 --- a/cmd/lotus-fountain/main.go +++ b/cmd/lotus-fountain/main.go @@ -15,6 +15,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/lotus-gateway/main.go b/cmd/lotus-gateway/main.go index 962bed274..89b2152dd 100644 --- a/cmd/lotus-gateway/main.go +++ b/cmd/lotus-gateway/main.go @@ -6,18 +6,16 @@ import ( "net" "os" + logging "github.com/ipfs/go-log/v2" + manet "github.com/multiformats/go-multiaddr/net" "github.com/urfave/cli/v2" "go.opencensus.io/stats/view" "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" - + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-state-types/abi" - manet "github.com/multiformats/go-multiaddr/net" - - "github.com/filecoin-project/go-address" "github.com/filecoin-project/lotus/api/client" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/lotus-health/main.go b/cmd/lotus-health/main.go index 73a0f711d..c1bf7a459 100644 --- a/cmd/lotus-health/main.go +++ b/cmd/lotus-health/main.go @@ -8,14 +8,13 @@ import ( "syscall" "time" - "github.com/filecoin-project/lotus/api/v0api" - cid "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/urfave/cli/v2" "github.com/filecoin-project/go-jsonrpc" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-keygen/main.go b/cmd/lotus-keygen/main.go index ebf981e8b..1970d5074 100644 --- a/cmd/lotus-keygen/main.go +++ b/cmd/lotus-keygen/main.go @@ -5,11 +5,12 @@ import ( "fmt" "os" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" - "github.com/urfave/cli/v2" ) func main() { diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index a6d047e37..945f6e185 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -6,16 +6,8 @@ import ( "os" "strings" - "github.com/filecoin-project/lotus/api" - - lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - - "github.com/filecoin-project/go-state-types/network" - - rlepluslazy "github.com/filecoin-project/go-bitfield/rle" - cbor "github.com/ipfs/go-ipld-cbor" - "github.com/fatih/color" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/libp2p/go-libp2p-core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" @@ -23,15 +15,19 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" + rlepluslazy "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "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/network" + + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" + lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/lib/tablewriter" diff --git a/cmd/lotus-miner/allinfo_test.go b/cmd/lotus-miner/allinfo_test.go index 9a5359213..6d439869a 100644 --- a/cmd/lotus-miner/allinfo_test.go +++ b/cmd/lotus-miner/allinfo_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/filecoin-project/lotus/itests/kit" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/node/repo" ) diff --git a/cmd/lotus-miner/index_provider.go b/cmd/lotus-miner/index_provider.go index b784ad695..1e4b69d86 100644 --- a/cmd/lotus-miner/index_provider.go +++ b/cmd/lotus-miner/index_provider.go @@ -3,9 +3,8 @@ package main import ( "fmt" - "github.com/ipfs/go-cid" - "github.com/fatih/color" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-miner/info.go b/cmd/lotus-miner/info.go index 3b28fe18f..8b6809942 100644 --- a/cmd/lotus-miner/info.go +++ b/cmd/lotus-miner/info.go @@ -12,22 +12,20 @@ import ( "time" "github.com/fatih/color" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" "golang.org/x/xerrors" - cbor "github.com/ipfs/go-ipld-cbor" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/api/v0api" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" @@ -36,6 +34,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/journal/alerting" ) diff --git a/cmd/lotus-miner/init.go b/cmd/lotus-miner/init.go index b2c71e18c..1e7b07a59 100644 --- a/cmd/lotus-miner/init.go +++ b/cmd/lotus-miner/init.go @@ -13,11 +13,6 @@ import ( "path/filepath" "strconv" - "github.com/filecoin-project/go-state-types/builtin" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - - power6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/docker/go-units" "github.com/google/uuid" "github.com/ipfs/go-datastore" @@ -33,14 +28,12 @@ import ( 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" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-statestore" - sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/filecoin-project/lotus/extern/sector-storage/stores" - "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" power2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/power" + power6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" @@ -53,6 +46,10 @@ import ( "github.com/filecoin-project/lotus/chain/gen/slashfilter" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" + sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" + "github.com/filecoin-project/lotus/extern/sector-storage/stores" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/journal" diff --git a/cmd/lotus-miner/init_restore.go b/cmd/lotus-miner/init_restore.go index e5f8174de..fc55f845c 100644 --- a/cmd/lotus-miner/init_restore.go +++ b/cmd/lotus-miner/init_restore.go @@ -6,9 +6,6 @@ import ( "io/ioutil" "os" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/v0api" - "github.com/docker/go-units" "github.com/ipfs/go-datastore" "github.com/libp2p/go-libp2p-core/peer" @@ -21,7 +18,9 @@ import ( "github.com/filecoin-project/go-paramfetch" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-miner/init_service.go b/cmd/lotus-miner/init_service.go index d0d0e3fa9..0c2d19cfd 100644 --- a/cmd/lotus-miner/init_service.go +++ b/cmd/lotus-miner/init_service.go @@ -4,8 +4,13 @@ import ( "context" "strings" + "github.com/libp2p/go-libp2p-core/peer" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/client" @@ -13,9 +18,6 @@ import ( cliutil "github.com/filecoin-project/lotus/cli/util" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/node/config" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) const ( diff --git a/cmd/lotus-miner/main.go b/cmd/lotus-miner/main.go index e12dc3f32..0462373ae 100644 --- a/cmd/lotus-miner/main.go +++ b/cmd/lotus-miner/main.go @@ -9,13 +9,12 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/xerrors" - cliutil "github.com/filecoin-project/lotus/cli/util" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" + cliutil "github.com/filecoin-project/lotus/cli/util" "github.com/filecoin-project/lotus/lib/lotuslog" "github.com/filecoin-project/lotus/lib/tracing" "github.com/filecoin-project/lotus/node/repo" diff --git a/cmd/lotus-miner/pieces.go b/cmd/lotus-miner/pieces.go index 778f8e6cf..a64142237 100644 --- a/cmd/lotus-miner/pieces.go +++ b/cmd/lotus-miner/pieces.go @@ -5,10 +5,11 @@ import ( "os" "text/tabwriter" - lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/lotus/lib/tablewriter" "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" + + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/lib/tablewriter" ) var piecesCmd = &cli.Command{ diff --git a/cmd/lotus-miner/precommits-info.go b/cmd/lotus-miner/precommits-info.go index 2075ed339..034378cff 100644 --- a/cmd/lotus-miner/precommits-info.go +++ b/cmd/lotus-miner/precommits-info.go @@ -4,15 +4,16 @@ import ( "fmt" "sort" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/chain/types" - lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/specs-actors/v7/actors/util/adt" cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" + + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" ) var sectorPreCommitsCmd = &cli.Command{ diff --git a/cmd/lotus-miner/proving.go b/cmd/lotus-miner/proving.go index faae5e955..76d3edc60 100644 --- a/cmd/lotus-miner/proving.go +++ b/cmd/lotus-miner/proving.go @@ -14,13 +14,14 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/specs-storage/storage" ) var provingCmd = &cli.Command{ diff --git a/cmd/lotus-miner/retrieval-deals.go b/cmd/lotus-miner/retrieval-deals.go index bd5d30a4e..9fa943f4f 100644 --- a/cmd/lotus-miner/retrieval-deals.go +++ b/cmd/lotus-miner/retrieval-deals.go @@ -7,9 +7,10 @@ import ( "text/tabwriter" "github.com/docker/go-units" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-state-types/abi" - "github.com/urfave/cli/v2" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-miner/run.go b/cmd/lotus-miner/run.go index f276f319c..14dde73ff 100644 --- a/cmd/lotus-miner/run.go +++ b/cmd/lotus-miner/run.go @@ -5,10 +5,6 @@ import ( _ "net/http/pprof" "os" - "github.com/filecoin-project/lotus/api/v1api" - - "github.com/filecoin-project/lotus/api/v0api" - "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" "go.opencensus.io/stats" @@ -17,6 +13,8 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/lib/ulimit" diff --git a/cmd/lotus-miner/sealing.go b/cmd/lotus-miner/sealing.go index 21e672e38..975bec7d1 100644 --- a/cmd/lotus-miner/sealing.go +++ b/cmd/lotus-miner/sealing.go @@ -21,12 +21,12 @@ import ( "github.com/filecoin-project/go-padreader" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" - "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/lotus/lib/httpreader" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" + "github.com/filecoin-project/lotus/lib/httpreader" ) var sealingCmd = &cli.Command{ diff --git a/cmd/lotus-miner/sectors.go b/cmd/lotus-miner/sectors.go index 1ecc01295..edbb62b1f 100644 --- a/cmd/lotus-miner/sectors.go +++ b/cmd/lotus-miner/sectors.go @@ -21,9 +21,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "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/network" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors" @@ -31,10 +31,9 @@ import ( lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/lib/tablewriter" - lcli "github.com/filecoin-project/lotus/cli" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" + "github.com/filecoin-project/lotus/lib/tablewriter" ) var sectorsCmd = &cli.Command{ diff --git a/cmd/lotus-miner/storage.go b/cmd/lotus-miner/storage.go index 6d3ced35c..80a722f62 100644 --- a/cmd/lotus-miner/storage.go +++ b/cmd/lotus-miner/storage.go @@ -12,8 +12,6 @@ import ( "strings" "time" - "github.com/filecoin-project/lotus/api/v0api" - "github.com/docker/go-units" "github.com/fatih/color" "github.com/google/uuid" @@ -26,6 +24,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" diff --git a/cmd/lotus-pcr/main.go b/cmd/lotus-pcr/main.go index 46ba49834..474ed55f7 100644 --- a/cmd/lotus-pcr/main.go +++ b/cmd/lotus-pcr/main.go @@ -16,36 +16,29 @@ import ( "strings" "time" - "github.com/filecoin-project/go-state-types/builtin" - - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - - lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" - lcli "github.com/filecoin-project/lotus/cli" - - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" - - "github.com/filecoin-project/go-state-types/network" - "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" - "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" + miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" + lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/tools/stats/sync" ) diff --git a/cmd/lotus-seed/genesis.go b/cmd/lotus-seed/genesis.go index 27bf25466..a3cc89017 100644 --- a/cmd/lotus-seed/genesis.go +++ b/cmd/lotus-seed/genesis.go @@ -9,13 +9,6 @@ import ( "strconv" "strings" - "github.com/filecoin-project/go-state-types/network" - - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/chain/vm" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/filecoin-project/lotus/journal" - "github.com/filecoin-project/lotus/node/modules/testing" "github.com/google/uuid" "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" @@ -24,12 +17,18 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/gen" genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/genesis" + "github.com/filecoin-project/lotus/journal" + "github.com/filecoin-project/lotus/node/modules/testing" ) var genesisCmd = &cli.Command{ diff --git a/cmd/lotus-seed/main.go b/cmd/lotus-seed/main.go index ce8b87df9..7567f6393 100644 --- a/cmd/lotus-seed/main.go +++ b/cmd/lotus-seed/main.go @@ -7,8 +7,6 @@ import ( "io/ioutil" "os" - "github.com/filecoin-project/go-state-types/network" - "github.com/docker/go-units" logging "github.com/ipfs/go-log/v2" "github.com/mitchellh/go-homedir" @@ -17,6 +15,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" diff --git a/cmd/lotus-seed/seed/seed.go b/cmd/lotus-seed/seed/seed.go index 55411713e..2cb629bec 100644 --- a/cmd/lotus-seed/seed/seed.go +++ b/cmd/lotus-seed/seed/seed.go @@ -22,9 +22,8 @@ import ( "github.com/filecoin-project/go-commp-utils/zerocomm" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-storage/storage" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" diff --git a/cmd/lotus-shed/actor.go b/cmd/lotus-shed/actor.go index 4a63a1ac5..fa337d3ec 100644 --- a/cmd/lotus-shed/actor.go +++ b/cmd/lotus-shed/actor.go @@ -5,9 +5,6 @@ import ( "fmt" "os" - "github.com/filecoin-project/go-state-types/builtin" - "github.com/filecoin-project/go-state-types/network" - "github.com/fatih/color" "github.com/urfave/cli/v2" "golang.org/x/xerrors" @@ -15,10 +12,11 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/api" - + "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/network" miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" + "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" diff --git a/cmd/lotus-shed/balances.go b/cmd/lotus-shed/balances.go index 1a22be3c3..1318b8c6a 100644 --- a/cmd/lotus-shed/balances.go +++ b/cmd/lotus-shed/balances.go @@ -13,20 +13,7 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - - "github.com/filecoin-project/lotus/chain/gen/genesis" - - _init "github.com/filecoin-project/lotus/chain/actors/builtin/init" - "github.com/docker/go-units" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" - "github.com/filecoin-project/lotus/chain/actors/builtin/power" - "github.com/filecoin-project/lotus/chain/actors/builtin/reward" - "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log/v2" @@ -37,8 +24,16 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" + _init "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" + "github.com/filecoin-project/lotus/chain/actors/builtin/power" + "github.com/filecoin-project/lotus/chain/actors/builtin/reward" + "github.com/filecoin-project/lotus/chain/consensus/filcns" + "github.com/filecoin-project/lotus/chain/gen/genesis" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/cmd/lotus-shed/base32.go b/cmd/lotus-shed/base32.go index cd30a2146..4ca177316 100644 --- a/cmd/lotus-shed/base32.go +++ b/cmd/lotus-shed/base32.go @@ -7,9 +7,8 @@ import ( "os" "strings" - "github.com/urfave/cli/v2" - "github.com/multiformats/go-base32" + "github.com/urfave/cli/v2" ) var base32Cmd = &cli.Command{ diff --git a/cmd/lotus-shed/base64.go b/cmd/lotus-shed/base64.go index 3f0469ef9..9143a6a19 100644 --- a/cmd/lotus-shed/base64.go +++ b/cmd/lotus-shed/base64.go @@ -8,11 +8,10 @@ import ( "os" "strings" - "github.com/filecoin-project/go-state-types/abi" + "github.com/urfave/cli/v2" "github.com/filecoin-project/go-address" - - "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/abi" ) var base64Cmd = &cli.Command{ diff --git a/cmd/lotus-shed/bigint.go b/cmd/lotus-shed/bigint.go index e087a341a..88c2b4399 100644 --- a/cmd/lotus-shed/bigint.go +++ b/cmd/lotus-shed/bigint.go @@ -5,8 +5,9 @@ import ( "encoding/hex" "fmt" - "github.com/filecoin-project/lotus/chain/types" "github.com/urfave/cli/v2" + + "github.com/filecoin-project/lotus/chain/types" ) var bigIntParseCmd = &cli.Command{ diff --git a/cmd/lotus-shed/blockmsgid.go b/cmd/lotus-shed/blockmsgid.go index 3dc26b92d..4a0250d1e 100644 --- a/cmd/lotus-shed/blockmsgid.go +++ b/cmd/lotus-shed/blockmsgid.go @@ -4,11 +4,10 @@ import ( "encoding/base64" "fmt" + "github.com/ipfs/go-cid" blake2b "github.com/minio/blake2b-simd" "github.com/urfave/cli/v2" - "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" ) diff --git a/cmd/lotus-shed/cid.go b/cmd/lotus-shed/cid.go index f98206a56..6540f8358 100644 --- a/cmd/lotus-shed/cid.go +++ b/cmd/lotus-shed/cid.go @@ -6,14 +6,15 @@ import ( "fmt" "os" - "github.com/filecoin-project/lotus/blockstore" - "github.com/ipld/go-car" - - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" + "github.com/ipld/go-car" mh "github.com/multiformats/go-multihash" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/blockstore" ) var cidCmd = &cli.Command{ diff --git a/cmd/lotus-shed/commp.go b/cmd/lotus-shed/commp.go index 6f7923c24..275b6a8e5 100644 --- a/cmd/lotus-shed/commp.go +++ b/cmd/lotus-shed/commp.go @@ -5,9 +5,10 @@ import ( "encoding/hex" "fmt" - commcid "github.com/filecoin-project/go-fil-commcid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + commcid "github.com/filecoin-project/go-fil-commcid" ) var commpToCidCmd = &cli.Command{ diff --git a/cmd/lotus-shed/consensus.go b/cmd/lotus-shed/consensus.go index 2c5df4ea5..f235606e0 100644 --- a/cmd/lotus-shed/consensus.go +++ b/cmd/lotus-shed/consensus.go @@ -9,16 +9,18 @@ import ( "strings" "time" + "github.com/libp2p/go-libp2p-core/peer" + "github.com/multiformats/go-multiaddr" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/client" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" cliutil "github.com/filecoin-project/lotus/cli/util" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/multiformats/go-multiaddr" - "github.com/urfave/cli/v2" ) var consensusCmd = &cli.Command{ diff --git a/cmd/lotus-shed/cron-count.go b/cmd/lotus-shed/cron-count.go index 622f38791..2b8dc8ebf 100644 --- a/cmd/lotus-shed/cron-count.go +++ b/cmd/lotus-shed/cron-count.go @@ -3,11 +3,13 @@ package main import ( "fmt" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/build" - lcli "github.com/filecoin-project/lotus/cli" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/build" + lcli "github.com/filecoin-project/lotus/cli" ) var cronWcCmd = &cli.Command{ diff --git a/cmd/lotus-shed/deal-label.go b/cmd/lotus-shed/deal-label.go index 6c222a4b8..417d13701 100644 --- a/cmd/lotus-shed/deal-label.go +++ b/cmd/lotus-shed/deal-label.go @@ -5,18 +5,18 @@ import ( "fmt" "io" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - - "github.com/filecoin-project/lotus/chain/consensus/filcns" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/state" - "github.com/filecoin-project/lotus/chain/store" - "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/specs-actors/v4/actors/util/adt" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/consensus/filcns" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/node/repo" ) var dealLabelCmd = &cli.Command{ diff --git a/cmd/lotus-shed/diff.go b/cmd/lotus-shed/diff.go index d576f73b4..9fc6f7963 100644 --- a/cmd/lotus-shed/diff.go +++ b/cmd/lotus-shed/diff.go @@ -3,11 +3,10 @@ package main import ( "fmt" + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" ) diff --git a/cmd/lotus-shed/election.go b/cmd/lotus-shed/election.go index d49d5c04f..7ac74de48 100644 --- a/cmd/lotus-shed/election.go +++ b/cmd/lotus-shed/election.go @@ -6,16 +6,17 @@ import ( "fmt" "math/rand" - "github.com/filecoin-project/lotus/api/v0api" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) var electionCmd = &cli.Command{ diff --git a/cmd/lotus-shed/export.go b/cmd/lotus-shed/export.go index fec4d575a..57a9fd3ef 100644 --- a/cmd/lotus-shed/export.go +++ b/cmd/lotus-shed/export.go @@ -15,7 +15,6 @@ import ( "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/pb" "github.com/dustin/go-humanize" - "github.com/filecoin-project/go-state-types/abi" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" @@ -28,6 +27,8 @@ import ( "go.uber.org/zap" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/lotus-shed/fr32.go b/cmd/lotus-shed/fr32.go index 940717f74..f3f6d0669 100644 --- a/cmd/lotus-shed/fr32.go +++ b/cmd/lotus-shed/fr32.go @@ -8,6 +8,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/extern/sector-storage/fr32" ) diff --git a/cmd/lotus-shed/frozen-miners.go b/cmd/lotus-shed/frozen-miners.go index ed09c00c5..035777bd6 100644 --- a/cmd/lotus-shed/frozen-miners.go +++ b/cmd/lotus-shed/frozen-miners.go @@ -3,11 +3,13 @@ package main import ( "fmt" - "github.com/filecoin-project/go-state-types/abi" - lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" + + lcli "github.com/filecoin-project/lotus/cli" ) var frozenMinersCmd = &cli.Command{ diff --git a/cmd/lotus-shed/genesis-verify.go b/cmd/lotus-shed/genesis-verify.go index cc042064d..4d961492f 100644 --- a/cmd/lotus-shed/genesis-verify.go +++ b/cmd/lotus-shed/genesis-verify.go @@ -6,11 +6,6 @@ import ( "os" "sort" - _init "github.com/filecoin-project/lotus/chain/actors/builtin/init" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - "github.com/fatih/color" "github.com/ipfs/go-datastore" cbor "github.com/ipfs/go-ipld-cbor" @@ -23,9 +18,12 @@ import ( "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/account" + _init "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/cmd/lotus-shed/hello.go b/cmd/lotus-shed/hello.go index e3a3756a9..23a11f118 100644 --- a/cmd/lotus-shed/hello.go +++ b/cmd/lotus-shed/hello.go @@ -6,12 +6,14 @@ import ( "fmt" "time" - cborutil "github.com/filecoin-project/go-cbor-util" - lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/lotus/node/hello" "github.com/libp2p/go-libp2p" inet "github.com/libp2p/go-libp2p-core/network" "github.com/urfave/cli/v2" + + cborutil "github.com/filecoin-project/go-cbor-util" + + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/node/hello" ) var resultCh chan bool diff --git a/cmd/lotus-shed/keyinfo.go b/cmd/lotus-shed/keyinfo.go index 00ac9dc50..a8c5e1484 100644 --- a/cmd/lotus-shed/keyinfo.go +++ b/cmd/lotus-shed/keyinfo.go @@ -13,23 +13,19 @@ import ( "strings" "text/template" - "github.com/urfave/cli/v2" - - "golang.org/x/xerrors" - - "github.com/multiformats/go-base32" - "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/peer" + "github.com/multiformats/go-base32" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" + _ "github.com/filecoin-project/lotus/lib/sigs/bls" + _ "github.com/filecoin-project/lotus/lib/sigs/secp" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/modules/lp2p" "github.com/filecoin-project/lotus/node/repo" - - _ "github.com/filecoin-project/lotus/lib/sigs/bls" - _ "github.com/filecoin-project/lotus/lib/sigs/secp" ) var validTypes = []types.KeyType{types.KTBLS, types.KTSecp256k1, lp2p.KTLibp2pHost} diff --git a/cmd/lotus-shed/ledger.go b/cmd/lotus-shed/ledger.go index 742cf75c3..20de8dd89 100644 --- a/cmd/lotus-shed/ledger.go +++ b/cmd/lotus-shed/ledger.go @@ -6,14 +6,14 @@ import ( "strconv" "strings" - "github.com/filecoin-project/lotus/api/v0api" + "github.com/urfave/cli/v2" + ledgerfil "github.com/whyrusleeping/ledger-filecoin-go" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" - "github.com/urfave/cli/v2" - ledgerfil "github.com/whyrusleeping/ledger-filecoin-go" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/chain/types" ledgerwallet "github.com/filecoin-project/lotus/chain/wallet/ledger" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-shed/market.go b/cmd/lotus-shed/market.go index 4cd018628..29b2fb112 100644 --- a/cmd/lotus-shed/market.go +++ b/cmd/lotus-shed/market.go @@ -6,25 +6,22 @@ import ( "os" "path" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - - levelds "github.com/ipfs/go-ds-leveldb" - ldbopts "github.com/syndtr/goleveldb/leveldb/opt" - - "github.com/filecoin-project/lotus/lib/backupds" - - "github.com/filecoin-project/lotus/node/repo" "github.com/ipfs/go-datastore" dsq "github.com/ipfs/go-datastore/query" + levelds "github.com/ipfs/go-ds-leveldb" logging "github.com/ipfs/go-log/v2" - - lcli "github.com/filecoin-project/lotus/cli" + ldbopts "github.com/syndtr/goleveldb/leveldb/opt" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" + + "github.com/filecoin-project/lotus/chain/actors/builtin/market" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/lib/backupds" + "github.com/filecoin-project/lotus/node/repo" ) var marketCmd = &cli.Command{ diff --git a/cmd/lotus-shed/math.go b/cmd/lotus-shed/math.go index 4b53495f0..09776d4e7 100644 --- a/cmd/lotus-shed/math.go +++ b/cmd/lotus-shed/math.go @@ -7,11 +7,11 @@ import ( "os" "strings" - miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/urfave/cli/v2" "golang.org/x/xerrors" + miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/cmd/lotus-shed/mempool-stats.go b/cmd/lotus-shed/mempool-stats.go index 5a98f6965..9e4a2629c 100644 --- a/cmd/lotus-shed/mempool-stats.go +++ b/cmd/lotus-shed/mempool-stats.go @@ -6,9 +6,6 @@ import ( "sort" "time" - "github.com/filecoin-project/go-state-types/builtin" - lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" - "contrib.go.opencensus.io/exporter/prometheus" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" @@ -18,7 +15,10 @@ import ( "go.opencensus.io/tag" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/builtin" + lapi "github.com/filecoin-project/lotus/api" + lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" ) diff --git a/cmd/lotus-shed/migrations.go b/cmd/lotus-shed/migrations.go index 85987c658..55625c8eb 100644 --- a/cmd/lotus-shed/migrations.go +++ b/cmd/lotus-shed/migrations.go @@ -6,18 +6,18 @@ import ( "io" "time" - "github.com/filecoin-project/lotus/chain/stmgr" - "github.com/filecoin-project/lotus/chain/vm" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/filecoin-project/specs-actors/v7/actors/migration/nv15" - - "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/lotus/chain/consensus/filcns" - "github.com/filecoin-project/lotus/chain/store" - "github.com/filecoin-project/lotus/node/repo" "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" + + "github.com/filecoin-project/specs-actors/v7/actors/migration/nv15" + + "github.com/filecoin-project/lotus/chain/consensus/filcns" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" + "github.com/filecoin-project/lotus/node/repo" ) var migrationsCmd = &cli.Command{ diff --git a/cmd/lotus-shed/miner-multisig.go b/cmd/lotus-shed/miner-multisig.go index dd36a7a7d..aba08113f 100644 --- a/cmd/lotus-shed/miner-multisig.go +++ b/cmd/lotus-shed/miner-multisig.go @@ -5,23 +5,21 @@ import ( "fmt" "strconv" - "github.com/filecoin-project/go-state-types/builtin" - - "github.com/filecoin-project/go-state-types/abi" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" - - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" - - msig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" + miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" + miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" + msig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) var minerMultisigsCmd = &cli.Command{ diff --git a/cmd/lotus-shed/miner-peerid.go b/cmd/lotus-shed/miner-peerid.go index 5218bbe26..3d5911a4c 100644 --- a/cmd/lotus-shed/miner-peerid.go +++ b/cmd/lotus-shed/miner-peerid.go @@ -5,23 +5,22 @@ import ( "fmt" "io" + "github.com/ipfs/go-cid" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/libp2p/go-libp2p-core/peer" - - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - - "github.com/filecoin-project/lotus/chain/consensus/filcns" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/specs-actors/v4/actors/util/adt" - "github.com/ipfs/go-cid" - cbor "github.com/ipfs/go-ipld-cbor" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) var minerPeeridCmd = &cli.Command{ diff --git a/cmd/lotus-shed/miner-types.go b/cmd/lotus-shed/miner-types.go index 05ef7b0a7..822d037aa 100644 --- a/cmd/lotus-shed/miner-types.go +++ b/cmd/lotus-shed/miner-types.go @@ -6,23 +6,24 @@ import ( "io" "math/big" - big2 "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/chain/consensus/filcns" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - "github.com/filecoin-project/lotus/chain/actors/builtin/power" - "github.com/filecoin-project/lotus/chain/state" - "github.com/filecoin-project/lotus/chain/store" - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/node/repo" - builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" - "github.com/filecoin-project/specs-actors/v4/actors/util/adt" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + big2 "github.com/filecoin-project/go-state-types/big" + builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin" + "github.com/filecoin-project/specs-actors/v4/actors/util/adt" + + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/actors/builtin/power" + "github.com/filecoin-project/lotus/chain/consensus/filcns" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/repo" ) var minerTypesCmd = &cli.Command{ diff --git a/cmd/lotus-shed/miner.go b/cmd/lotus-shed/miner.go index e961a4b30..a23a44410 100644 --- a/cmd/lotus-shed/miner.go +++ b/cmd/lotus-shed/miner.go @@ -9,7 +9,11 @@ import ( "path/filepath" "strings" + "github.com/docker/go-units" "github.com/ipfs/go-cid" + "github.com/mitchellh/go-homedir" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" @@ -21,18 +25,12 @@ import ( power7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" - "github.com/docker/go-units" - "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/builtin/power" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - - "github.com/mitchellh/go-homedir" - "github.com/urfave/cli/v2" - "golang.org/x/xerrors" ) var minerCmd = &cli.Command{ diff --git a/cmd/lotus-shed/misc.go b/cmd/lotus-shed/misc.go index b342fab0a..cfda362c4 100644 --- a/cmd/lotus-shed/misc.go +++ b/cmd/lotus-shed/misc.go @@ -4,8 +4,9 @@ import ( "fmt" "strconv" - "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/urfave/cli/v2" + + "github.com/filecoin-project/go-fil-markets/storagemarket" ) var miscCmd = &cli.Command{ diff --git a/cmd/lotus-shed/mpool.go b/cmd/lotus-shed/mpool.go index f4744d615..cfbff2abd 100644 --- a/cmd/lotus-shed/mpool.go +++ b/cmd/lotus-shed/mpool.go @@ -3,10 +3,11 @@ package main import ( "fmt" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/urfave/cli/v2" ) var mpoolCmd = &cli.Command{ diff --git a/cmd/lotus-shed/msg.go b/cmd/lotus-shed/msg.go index d8e02bc82..bd8bd64f0 100644 --- a/cmd/lotus-shed/msg.go +++ b/cmd/lotus-shed/msg.go @@ -14,11 +14,11 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" ) var msgCmd = &cli.Command{ diff --git a/cmd/lotus-shed/nonce-fix.go b/cmd/lotus-shed/nonce-fix.go index 8102fd8a9..d69c8a48d 100644 --- a/cmd/lotus-shed/nonce-fix.go +++ b/cmd/lotus-shed/nonce-fix.go @@ -4,10 +4,11 @@ import ( "fmt" "math" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/urfave/cli/v2" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-shed/params.go b/cmd/lotus-shed/params.go index e45d9489c..107a04ac2 100644 --- a/cmd/lotus-shed/params.go +++ b/cmd/lotus-shed/params.go @@ -2,12 +2,13 @@ package main import ( "github.com/docker/go-units" - paramfetch "github.com/filecoin-project/go-paramfetch" - lcli "github.com/filecoin-project/lotus/cli" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/lotus/build" + lcli "github.com/filecoin-project/lotus/cli" ) var fetchParamCmd = &cli.Command{ diff --git a/cmd/lotus-shed/postfind.go b/cmd/lotus-shed/postfind.go index c8a4c9907..23eb4ceb7 100644 --- a/cmd/lotus-shed/postfind.go +++ b/cmd/lotus-shed/postfind.go @@ -3,14 +3,16 @@ package main import ( "fmt" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/specs-actors/v2/actors/builtin" + lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/urfave/cli/v2" ) var postFindCmd = &cli.Command{ diff --git a/cmd/lotus-shed/proofs.go b/cmd/lotus-shed/proofs.go index 13fdf008a..65cf04918 100644 --- a/cmd/lotus-shed/proofs.go +++ b/cmd/lotus-shed/proofs.go @@ -4,14 +4,13 @@ import ( "encoding/hex" "fmt" - prooftypes "github.com/filecoin-project/go-state-types/proof" - + "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" + prooftypes "github.com/filecoin-project/go-state-types/proof" ) var proofsCmd = &cli.Command{ diff --git a/cmd/lotus-shed/pruning.go b/cmd/lotus-shed/pruning.go index 164ff197a..275f3bc0a 100644 --- a/cmd/lotus-shed/pruning.go +++ b/cmd/lotus-shed/pruning.go @@ -5,14 +5,15 @@ import ( "fmt" "io" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/ipfs/bbloom" "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + badgerbs "github.com/filecoin-project/lotus/blockstore/badger" + "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/node/repo" ) diff --git a/cmd/lotus-shed/sectors.go b/cmd/lotus-shed/sectors.go index 91fa67d32..deb5cff8b 100644 --- a/cmd/lotus-shed/sectors.go +++ b/cmd/lotus-shed/sectors.go @@ -15,6 +15,8 @@ import ( "strconv" "sync" + "github.com/ipfs/go-cid" + "github.com/urfave/cli/v2" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" @@ -22,9 +24,6 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/builtin" - "github.com/ipfs/go-cid" - "github.com/urfave/cli/v2" - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" "github.com/filecoin-project/lotus/api/v0api" diff --git a/cmd/lotus-shed/signatures.go b/cmd/lotus-shed/signatures.go index d287e0c3f..0f43503f6 100644 --- a/cmd/lotus-shed/signatures.go +++ b/cmd/lotus-shed/signatures.go @@ -5,16 +5,16 @@ import ( "fmt" "strconv" - ffi "github.com/filecoin-project/filecoin-ffi" - lcli "github.com/filecoin-project/lotus/cli" "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/lotus/lib/sigs" - - "github.com/filecoin-project/go-address" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + ffi "github.com/filecoin-project/filecoin-ffi" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/crypto" + + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/lib/sigs" ) var signaturesCmd = &cli.Command{ diff --git a/cmd/lotus-shed/splitstore.go b/cmd/lotus-shed/splitstore.go index 58563955f..e8c45a0c5 100644 --- a/cmd/lotus-shed/splitstore.go +++ b/cmd/lotus-shed/splitstore.go @@ -10,15 +10,13 @@ import ( "runtime" "github.com/dgraph-io/badger/v2" - "github.com/urfave/cli/v2" - "go.uber.org/multierr" - "golang.org/x/sync/errgroup" - "golang.org/x/xerrors" - - "go.uber.org/zap" - "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" + "github.com/urfave/cli/v2" + "go.uber.org/multierr" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" + "golang.org/x/xerrors" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/node/config" diff --git a/cmd/lotus-shed/stateroot-stats.go b/cmd/lotus-shed/stateroot-stats.go index 6d5d57708..7937b3ccd 100644 --- a/cmd/lotus-shed/stateroot-stats.go +++ b/cmd/lotus-shed/stateroot-stats.go @@ -4,12 +4,12 @@ import ( "fmt" "sort" + "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/urfave/cli/v2" - "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" diff --git a/cmd/lotus-shed/storage-stats.go b/cmd/lotus-shed/storage-stats.go index b4e5991fd..68495545b 100644 --- a/cmd/lotus-shed/storage-stats.go +++ b/cmd/lotus-shed/storage-stats.go @@ -6,13 +6,15 @@ import ( "os" "strconv" + "github.com/ipfs/go-cid" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" filbig "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/ipfs/go-cid" - "github.com/urfave/cli/v2" ) // How many epochs back to look at for dealstats diff --git a/cmd/lotus-shed/sync.go b/cmd/lotus-shed/sync.go index cab3bd29e..397e76da3 100644 --- a/cmd/lotus-shed/sync.go +++ b/cmd/lotus-shed/sync.go @@ -4,19 +4,16 @@ import ( "fmt" "strconv" + "github.com/ipfs/go-cid" + "github.com/urfave/cli/v2" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/lotus/chain/actors/builtin/power" - - "github.com/filecoin-project/go-address" - - "github.com/filecoin-project/go-state-types/abi" - - "github.com/ipfs/go-cid" - "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "github.com/urfave/cli/v2" ) var syncCmd = &cli.Command{ diff --git a/cmd/lotus-shed/terminations.go b/cmd/lotus-shed/terminations.go index 357e7809e..87855cec7 100644 --- a/cmd/lotus-shed/terminations.go +++ b/cmd/lotus-shed/terminations.go @@ -7,24 +7,23 @@ import ( "io" "strconv" - "github.com/filecoin-project/go-state-types/builtin" - lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/ipfs/go-cid" + cbor "github.com/ipfs/go-ipld-cbor" + "github.com/urfave/cli/v2" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/go-state-types/builtin" + miner2 "github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/adt" + lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/consensus/filcns" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/repo" - miner2 "github.com/filecoin-project/specs-actors/actors/builtin/miner" - "github.com/ipfs/go-cid" - cbor "github.com/ipfs/go-ipld-cbor" - "github.com/urfave/cli/v2" ) var terminationsCmd = &cli.Command{ diff --git a/cmd/lotus-shed/verifreg.go b/cmd/lotus-shed/verifreg.go index ebd6df407..2731ea11b 100644 --- a/cmd/lotus-shed/verifreg.go +++ b/cmd/lotus-shed/verifreg.go @@ -4,30 +4,25 @@ import ( "encoding/hex" "fmt" - verifregtypes "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" - - "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" - - "github.com/filecoin-project/go-state-types/crypto" - - "github.com/filecoin-project/go-state-types/big" - + cbor "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - + "github.com/filecoin-project/go-state-types/big" + verifregtypes "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" + "github.com/filecoin-project/go-state-types/crypto" verifreg2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/verifreg" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - cbor "github.com/ipfs/go-ipld-cbor" ) var verifRegCmd = &cli.Command{ diff --git a/cmd/lotus-sim/info_commit.go b/cmd/lotus-sim/info_commit.go index d58106f33..e9bf8aa97 100644 --- a/cmd/lotus-sim/info_commit.go +++ b/cmd/lotus-sim/info_commit.go @@ -6,14 +6,14 @@ import ( "os" "syscall" - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/ipfs/go-cid" "github.com/koalacxr/quantile" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/cmd/lotus-sim/simulation" diff --git a/cmd/lotus-sim/info_wdpost.go b/cmd/lotus-sim/info_wdpost.go index 37383c4fc..426e85ca8 100644 --- a/cmd/lotus-sim/info_wdpost.go +++ b/cmd/lotus-sim/info_wdpost.go @@ -3,11 +3,10 @@ package main import ( "fmt" - "github.com/filecoin-project/go-state-types/builtin" - "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/lotus/chain/stmgr" diff --git a/cmd/lotus-sim/main.go b/cmd/lotus-sim/main.go index e6cd5d993..6b548e49c 100644 --- a/cmd/lotus-sim/main.go +++ b/cmd/lotus-sim/main.go @@ -7,9 +7,8 @@ import ( "os/signal" "syscall" - "github.com/urfave/cli/v2" - logging "github.com/ipfs/go-log/v2" + "github.com/urfave/cli/v2" ) var root []*cli.Command = []*cli.Command{ diff --git a/cmd/lotus-sim/simulation/block.go b/cmd/lotus-sim/simulation/block.go index 106bc53f5..341877a88 100644 --- a/cmd/lotus-sim/simulation/block.go +++ b/cmd/lotus-sim/simulation/block.go @@ -9,6 +9,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/cmd/lotus-sim/simulation/blockbuilder/blockbuilder.go b/cmd/lotus-sim/simulation/blockbuilder/blockbuilder.go index 392eaa7c8..5e84688ec 100644 --- a/cmd/lotus-sim/simulation/blockbuilder/blockbuilder.go +++ b/cmd/lotus-sim/simulation/blockbuilder/blockbuilder.go @@ -4,7 +4,6 @@ import ( "context" "math" - "github.com/filecoin-project/lotus/chain/consensus/filcns" "go.uber.org/zap" "golang.org/x/xerrors" @@ -17,11 +16,11 @@ import ( "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/account" + "github.com/filecoin-project/lotus/chain/consensus/filcns" lrand "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/chain/vm" ) diff --git a/cmd/lotus-sim/simulation/mock/mock.go b/cmd/lotus-sim/simulation/mock/mock.go index 5479cbec7..c172907b3 100644 --- a/cmd/lotus-sim/simulation/mock/mock.go +++ b/cmd/lotus-sim/simulation/mock/mock.go @@ -6,13 +6,12 @@ import ( "encoding/binary" "fmt" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + prooftypes "github.com/filecoin-project/go-state-types/proof" miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" tutils "github.com/filecoin-project/specs-actors/v5/support/testing" diff --git a/cmd/lotus-sim/simulation/node.go b/cmd/lotus-sim/simulation/node.go index da027ff4f..b0317c66b 100644 --- a/cmd/lotus-sim/simulation/node.go +++ b/cmd/lotus-sim/simulation/node.go @@ -4,11 +4,10 @@ import ( "context" "strings" - "go.uber.org/multierr" - "golang.org/x/xerrors" - "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" + "go.uber.org/multierr" + "golang.org/x/xerrors" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/consensus/filcns" diff --git a/cmd/lotus-sim/simulation/simulation.go b/cmd/lotus-sim/simulation/simulation.go index 21e8bff71..dc0b0e263 100644 --- a/cmd/lotus-sim/simulation/simulation.go +++ b/cmd/lotus-sim/simulation/simulation.go @@ -5,15 +5,14 @@ import ( "encoding/json" "runtime" + "github.com/ipfs/go-cid" + "github.com/ipfs/go-datastore" + logging "github.com/ipfs/go-log/v2" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" - "github.com/ipfs/go-cid" - "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log/v2" - blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" "github.com/filecoin-project/lotus/chain/consensus/filcns" diff --git a/cmd/lotus-sim/simulation/stages/commit_queue.go b/cmd/lotus-sim/simulation/stages/commit_queue.go index 1c689c32e..ec12c2776 100644 --- a/cmd/lotus-sim/simulation/stages/commit_queue.go +++ b/cmd/lotus-sim/simulation/stages/commit_queue.go @@ -3,10 +3,9 @@ package stages import ( "sort" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/chain/actors/policy" ) diff --git a/cmd/lotus-sim/simulation/stages/commit_queue_test.go b/cmd/lotus-sim/simulation/stages/commit_queue_test.go index 589f8b201..1b7f79978 100644 --- a/cmd/lotus-sim/simulation/stages/commit_queue_test.go +++ b/cmd/lotus-sim/simulation/stages/commit_queue_test.go @@ -4,12 +4,11 @@ package stages import ( "testing" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/chain/actors/policy" ) diff --git a/cmd/lotus-sim/simulation/stages/interface.go b/cmd/lotus-sim/simulation/stages/interface.go index 2e3d54722..d58321d87 100644 --- a/cmd/lotus-sim/simulation/stages/interface.go +++ b/cmd/lotus-sim/simulation/stages/interface.go @@ -3,10 +3,9 @@ package stages import ( "context" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/cmd/lotus-sim/simulation/blockbuilder" diff --git a/cmd/lotus-sim/simulation/stages/precommit_stage.go b/cmd/lotus-sim/simulation/stages/precommit_stage.go index dc5c16d0b..fc61ff08b 100644 --- a/cmd/lotus-sim/simulation/stages/precommit_stage.go +++ b/cmd/lotus-sim/simulation/stages/precommit_stage.go @@ -5,16 +5,14 @@ import ( "sort" "time" - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/network" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors" diff --git a/cmd/lotus-sim/simulation/stages/provecommit_stage.go b/cmd/lotus-sim/simulation/stages/provecommit_stage.go index a6c14f3d0..efa14e4e8 100644 --- a/cmd/lotus-sim/simulation/stages/provecommit_stage.go +++ b/cmd/lotus-sim/simulation/stages/provecommit_stage.go @@ -4,15 +4,13 @@ import ( "context" "time" - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" power5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/power" diff --git a/cmd/lotus-sim/simulation/stages/windowpost_stage.go b/cmd/lotus-sim/simulation/stages/windowpost_stage.go index 98490b9ca..0b4109d08 100644 --- a/cmd/lotus-sim/simulation/stages/windowpost_stage.go +++ b/cmd/lotus-sim/simulation/stages/windowpost_stage.go @@ -5,15 +5,13 @@ import ( "math" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/aerrors" diff --git a/cmd/lotus-stats/main.go b/cmd/lotus-stats/main.go index 706a453eb..2c3b80b3c 100644 --- a/cmd/lotus-stats/main.go +++ b/cmd/lotus-stats/main.go @@ -7,7 +7,14 @@ import ( "os" "time" + "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/view" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/tools/stats/influx" @@ -15,13 +22,6 @@ import ( "github.com/filecoin-project/lotus/tools/stats/metrics" "github.com/filecoin-project/lotus/tools/stats/points" "github.com/filecoin-project/lotus/tools/stats/sync" - - logging "github.com/ipfs/go-log/v2" - "github.com/urfave/cli/v2" - - "contrib.go.opencensus.io/exporter/prometheus" - stats "go.opencensus.io/stats" - "go.opencensus.io/stats/view" ) var log = logging.Logger("stats") diff --git a/cmd/lotus-wallet/main.go b/cmd/lotus-wallet/main.go index 8b7c82450..f15b9e84d 100644 --- a/cmd/lotus-wallet/main.go +++ b/cmd/lotus-wallet/main.go @@ -7,8 +7,6 @@ import ( "net/http" "os" - "github.com/filecoin-project/lotus/api/v0api" - "github.com/gbrlsnchs/jwt/v3" "github.com/gorilla/mux" logging "github.com/ipfs/go-log/v2" @@ -21,6 +19,7 @@ import ( "github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index f285ba74e..b77cb0bae 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -16,8 +16,6 @@ import ( "runtime/pprof" "strings" - "github.com/filecoin-project/go-jsonrpc" - paramfetch "github.com/filecoin-project/go-paramfetch" metricsprom "github.com/ipfs/go-metrics-prometheus" "github.com/mitchellh/go-homedir" "github.com/multiformats/go-multiaddr" @@ -29,6 +27,9 @@ import ( "golang.org/x/xerrors" "gopkg.in/cheggaaa/pb.v1" + "github.com/filecoin-project/go-jsonrpc" + paramfetch "github.com/filecoin-project/go-paramfetch" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/consensus/filcns" diff --git a/cmd/lotus/debug_advance.go b/cmd/lotus/debug_advance.go index 8af4f3660..dee2db97e 100644 --- a/cmd/lotus/debug_advance.go +++ b/cmd/lotus/debug_advance.go @@ -7,16 +7,17 @@ import ( "encoding/binary" "time" + "github.com/urfave/cli/v2" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" + lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" - "golang.org/x/xerrors" - - "github.com/urfave/cli/v2" ) func init() { diff --git a/cmd/tvx/exec.go b/cmd/tvx/exec.go index 750684c36..95a16e6d1 100644 --- a/cmd/tvx/exec.go +++ b/cmd/tvx/exec.go @@ -12,10 +12,10 @@ import ( "strings" "github.com/fatih/color" - "github.com/filecoin-project/go-address" cbornode "github.com/ipfs/go-ipld-cbor" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/test-vectors/schema" "github.com/filecoin-project/lotus/blockstore" diff --git a/cmd/tvx/extract.go b/cmd/tvx/extract.go index 281e469bb..540bb6c13 100644 --- a/cmd/tvx/extract.go +++ b/cmd/tvx/extract.go @@ -8,8 +8,9 @@ import ( "os" "path/filepath" - "github.com/filecoin-project/test-vectors/schema" "github.com/urfave/cli/v2" + + "github.com/filecoin-project/test-vectors/schema" ) const ( diff --git a/cmd/tvx/extract_many.go b/cmd/tvx/extract_many.go index 3520cd2ad..bc5ad2a30 100644 --- a/cmd/tvx/extract_many.go +++ b/cmd/tvx/extract_many.go @@ -11,13 +11,14 @@ import ( "strings" "github.com/fatih/color" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/exitcode" "github.com/hashicorp/go-multierror" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/lotus/chain/consensus/filcns" ) diff --git a/cmd/tvx/extract_message.go b/cmd/tvx/extract_message.go index 33ae5ab8f..db6b5322c 100644 --- a/cmd/tvx/extract_message.go +++ b/cmd/tvx/extract_message.go @@ -9,7 +9,10 @@ import ( "log" "github.com/fatih/color" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/test-vectors/schema" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" @@ -19,10 +22,6 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/conformance" - - "github.com/filecoin-project/test-vectors/schema" - - "github.com/ipfs/go-cid" ) func doExtractMessage(opts extractOpts) error { diff --git a/cmd/tvx/extract_tipset.go b/cmd/tvx/extract_tipset.go index 05e856aa1..553961f44 100644 --- a/cmd/tvx/extract_tipset.go +++ b/cmd/tvx/extract_tipset.go @@ -8,9 +8,10 @@ import ( "log" "strings" - "github.com/filecoin-project/test-vectors/schema" "github.com/ipfs/go-cid" + "github.com/filecoin-project/test-vectors/schema" + "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/conformance" diff --git a/cmd/tvx/main.go b/cmd/tvx/main.go index 0fed8fad4..b1541e4e1 100644 --- a/cmd/tvx/main.go +++ b/cmd/tvx/main.go @@ -6,9 +6,10 @@ import ( "os" "sort" - "github.com/filecoin-project/go-jsonrpc" "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-jsonrpc" + "github.com/filecoin-project/lotus/api/v0api" lcli "github.com/filecoin-project/lotus/cli" ) diff --git a/cmd/tvx/simulate.go b/cmd/tvx/simulate.go index 5428e16ee..ea7b67a66 100644 --- a/cmd/tvx/simulate.go +++ b/cmd/tvx/simulate.go @@ -11,9 +11,10 @@ import ( "os/exec" "github.com/fatih/color" + "github.com/urfave/cli/v2" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/test-vectors/schema" - "github.com/urfave/cli/v2" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/tvx/state.go b/cmd/tvx/state.go index f2d25300a..120eddd6b 100644 --- a/cmd/tvx/state.go +++ b/cmd/tvx/state.go @@ -6,15 +6,15 @@ import ( "io" "log" - "github.com/filecoin-project/lotus/api/v0api" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" "github.com/ipfs/go-cid" format "github.com/ipfs/go-ipld-format" "github.com/ipld/go-car" cbg "github.com/whyrusleeping/cbor-gen" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api/v0api" init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" diff --git a/cmd/tvx/stores.go b/cmd/tvx/stores.go index ba54a7f9e..0f4f81397 100644 --- a/cmd/tvx/stores.go +++ b/cmd/tvx/stores.go @@ -5,24 +5,21 @@ import ( "log" "sync" - "github.com/filecoin-project/lotus/api/v0api" - "github.com/fatih/color" - dssync "github.com/ipfs/go-datastore/sync" - - "github.com/filecoin-project/lotus/blockstore" - - "github.com/filecoin-project/lotus/chain/actors/adt" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" + dssync "github.com/ipfs/go-datastore/sync" exchange "github.com/ipfs/go-ipfs-exchange-interface" offline "github.com/ipfs/go-ipfs-exchange-offline" cbor "github.com/ipfs/go-ipld-cbor" format "github.com/ipfs/go-ipld-format" "github.com/ipfs/go-merkledag" + + "github.com/filecoin-project/lotus/api/v0api" + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors/adt" ) // Stores is a collection of the different stores and services that are needed diff --git a/conformance/chaos/actor.go b/conformance/chaos/actor.go index f5a94989d..7b28a058d 100644 --- a/conformance/chaos/actor.go +++ b/conformance/chaos/actor.go @@ -1,16 +1,17 @@ package chaos import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/rt" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/ipfs/go-cid" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" runtime2 "github.com/filecoin-project/specs-actors/v2/actors/runtime" + + "github.com/filecoin-project/lotus/chain/actors/builtin" ) //go:generate go run ./gen diff --git a/conformance/chaos/actor_test.go b/conformance/chaos/actor_test.go index b21b97ec7..c0caf173e 100644 --- a/conformance/chaos/actor_test.go +++ b/conformance/chaos/actor_test.go @@ -5,11 +5,11 @@ import ( "context" "testing" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/ipfs/go-cid" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" mock2 "github.com/filecoin-project/specs-actors/v2/support/mock" atesting2 "github.com/filecoin-project/specs-actors/v2/support/testing" diff --git a/conformance/chaos/cbor_gen.go b/conformance/chaos/cbor_gen.go index 436849cdc..2deaaa53f 100644 --- a/conformance/chaos/cbor_gen.go +++ b/conformance/chaos/cbor_gen.go @@ -8,12 +8,13 @@ import ( "math" "sort" - address "github.com/filecoin-project/go-address" - abi "github.com/filecoin-project/go-state-types/abi" - exitcode "github.com/filecoin-project/go-state-types/exitcode" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + address "github.com/filecoin-project/go-address" + abi "github.com/filecoin-project/go-state-types/abi" + exitcode "github.com/filecoin-project/go-state-types/exitcode" ) var _ = xerrors.Errorf diff --git a/conformance/chaos/gen/gen.go b/conformance/chaos/gen/gen.go index ac97da99e..20a1be64f 100644 --- a/conformance/chaos/gen/gen.go +++ b/conformance/chaos/gen/gen.go @@ -1,9 +1,9 @@ package main import ( - "github.com/filecoin-project/lotus/conformance/chaos" - gen "github.com/whyrusleeping/cbor-gen" + + "github.com/filecoin-project/lotus/conformance/chaos" ) func main() { diff --git a/conformance/chaos/ids.go b/conformance/chaos/ids.go index 6b0ad86a7..478169db5 100644 --- a/conformance/chaos/ids.go +++ b/conformance/chaos/ids.go @@ -1,9 +1,10 @@ package chaos import ( - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" + + "github.com/filecoin-project/go-address" ) // ChaosActorCodeCID is the CID by which this kind of actor will be identified. diff --git a/conformance/driver.go b/conformance/driver.go index 7993a15fc..f63fcaaf1 100644 --- a/conformance/driver.go +++ b/conformance/driver.go @@ -5,9 +5,17 @@ import ( gobig "math/big" "os" - "github.com/filecoin-project/go-state-types/network" + "github.com/ipfs/go-cid" + ds "github.com/ipfs/go-datastore" cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/test-vectors/schema" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/consensus/filcns" @@ -18,20 +26,8 @@ import ( "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/conformance/chaos" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - _ "github.com/filecoin-project/lotus/lib/sigs/bls" // enable bls signatures _ "github.com/filecoin-project/lotus/lib/sigs/secp" // enable secp signatures - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - - "github.com/filecoin-project/test-vectors/schema" - - "github.com/filecoin-project/go-address" - - "github.com/ipfs/go-cid" - ds "github.com/ipfs/go-datastore" ) var ( diff --git a/conformance/rand_record.go b/conformance/rand_record.go index 8422ad31d..277c984a7 100644 --- a/conformance/rand_record.go +++ b/conformance/rand_record.go @@ -7,7 +7,6 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/test-vectors/schema" "github.com/filecoin-project/lotus/api/v0api" diff --git a/conformance/rand_replay.go b/conformance/rand_replay.go index 6c2282752..ef19e41bb 100644 --- a/conformance/rand_replay.go +++ b/conformance/rand_replay.go @@ -6,7 +6,6 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/test-vectors/schema" "github.com/filecoin-project/lotus/chain/vm" diff --git a/conformance/runner.go b/conformance/runner.go index fd44ecff9..b6bb5a164 100644 --- a/conformance/runner.go +++ b/conformance/runner.go @@ -13,9 +13,6 @@ import ( "strconv" "github.com/fatih/color" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/go-state-types/network" "github.com/hashicorp/go-multierror" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" @@ -26,6 +23,9 @@ import ( "github.com/ipfs/go-merkledag" "github.com/ipld/go-car" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/test-vectors/schema" "github.com/filecoin-project/lotus/blockstore" diff --git a/extern/sector-storage/cbor_gen.go b/extern/sector-storage/cbor_gen.go index fd99576cc..eeea2b4f7 100644 --- a/extern/sector-storage/cbor_gen.go +++ b/extern/sector-storage/cbor_gen.go @@ -8,10 +8,11 @@ import ( "math" "sort" - sealtasks "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + sealtasks "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" ) var _ = xerrors.Errorf diff --git a/extern/sector-storage/ffiwrapper/sealer_cgo.go b/extern/sector-storage/ffiwrapper/sealer_cgo.go index cf5b40796..cfabaadfb 100644 --- a/extern/sector-storage/ffiwrapper/sealer_cgo.go +++ b/extern/sector-storage/ffiwrapper/sealer_cgo.go @@ -15,18 +15,17 @@ import ( "os" "runtime" - "github.com/filecoin-project/go-state-types/proof" - + "github.com/detailyang/go-fallocate" "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/detailyang/go-fallocate" ffi "github.com/filecoin-project/filecoin-ffi" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" commpffi "github.com/filecoin-project/go-commp-utils/ffiwrapper" "github.com/filecoin-project/go-commp-utils/zerocomm" commcid "github.com/filecoin-project/go-fil-commcid" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/fr32" diff --git a/extern/sector-storage/ffiwrapper/sealer_test.go b/extern/sector-storage/ffiwrapper/sealer_test.go index b182eff76..e878d92d1 100644 --- a/extern/sector-storage/ffiwrapper/sealer_test.go +++ b/extern/sector-storage/ffiwrapper/sealer_test.go @@ -15,22 +15,18 @@ import ( "testing" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - commpffi "github.com/filecoin-project/go-commp-utils/ffiwrapper" - "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" "golang.org/x/xerrors" - paramfetch "github.com/filecoin-project/go-paramfetch" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-storage/storage" - 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-state-types/abi" + prooftypes "github.com/filecoin-project/go-state-types/proof" + "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs" diff --git a/extern/sector-storage/ffiwrapper/types.go b/extern/sector-storage/ffiwrapper/types.go index 3c39a831e..bba810454 100644 --- a/extern/sector-storage/ffiwrapper/types.go +++ b/extern/sector-storage/ffiwrapper/types.go @@ -4,11 +4,10 @@ import ( "context" "io" - "github.com/filecoin-project/go-state-types/proof" - "github.com/ipfs/go-cid" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs" diff --git a/extern/sector-storage/ffiwrapper/unseal_ranges.go b/extern/sector-storage/ffiwrapper/unseal_ranges.go index 3a13c73a7..5e0dd759c 100644 --- a/extern/sector-storage/ffiwrapper/unseal_ranges.go +++ b/extern/sector-storage/ffiwrapper/unseal_ranges.go @@ -4,7 +4,6 @@ import ( "golang.org/x/xerrors" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/extern/sector-storage/partialfile" diff --git a/extern/sector-storage/fr32/fr32_ffi_cmp_test.go b/extern/sector-storage/fr32/fr32_ffi_cmp_test.go index 49eb11548..ff657ee29 100644 --- a/extern/sector-storage/fr32/fr32_ffi_cmp_test.go +++ b/extern/sector-storage/fr32/fr32_ffi_cmp_test.go @@ -7,15 +7,13 @@ import ( "os" "testing" - "github.com/filecoin-project/lotus/extern/sector-storage/fr32" + "github.com/stretchr/testify/require" ffi "github.com/filecoin-project/filecoin-ffi" - commpffi "github.com/filecoin-project/go-commp-utils/ffiwrapper" - "github.com/filecoin-project/go-state-types/abi" - "github.com/stretchr/testify/require" + "github.com/filecoin-project/lotus/extern/sector-storage/fr32" ) func TestWriteTwoPcs(t *testing.T) { diff --git a/extern/sector-storage/fr32/fr32_test.go b/extern/sector-storage/fr32/fr32_test.go index 0626f72a9..4793de645 100644 --- a/extern/sector-storage/fr32/fr32_test.go +++ b/extern/sector-storage/fr32/fr32_test.go @@ -8,10 +8,11 @@ import ( "os" "testing" + "github.com/stretchr/testify/require" + ffi "github.com/filecoin-project/filecoin-ffi" commpffi "github.com/filecoin-project/go-commp-utils/ffiwrapper" "github.com/filecoin-project/go-state-types/abi" - "github.com/stretchr/testify/require" "github.com/filecoin-project/lotus/extern/sector-storage/fr32" ) diff --git a/extern/sector-storage/manager.go b/extern/sector-storage/manager.go index e48aecb4e..b898d0e89 100644 --- a/extern/sector-storage/manager.go +++ b/extern/sector-storage/manager.go @@ -7,17 +7,16 @@ import ( "net/http" "sync" - "github.com/filecoin-project/go-statestore" - "github.com/hashicorp/go-multierror" - "github.com/mitchellh/go-homedir" - "github.com/google/uuid" + "github.com/hashicorp/go-multierror" cid "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" + "github.com/mitchellh/go-homedir" "go.uber.org/multierr" "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-statestore" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" diff --git a/extern/sector-storage/manager_post.go b/extern/sector-storage/manager_post.go index 8759da69d..70000c20f 100644 --- a/extern/sector-storage/manager_post.go +++ b/extern/sector-storage/manager_post.go @@ -10,7 +10,6 @@ import ( ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" diff --git a/extern/sector-storage/manager_test.go b/extern/sector-storage/manager_test.go index adda3c154..61c9cbf1d 100644 --- a/extern/sector-storage/manager_test.go +++ b/extern/sector-storage/manager_test.go @@ -16,16 +16,15 @@ import ( "testing" "time" - ffi "github.com/filecoin-project/filecoin-ffi" - "github.com/filecoin-project/go-state-types/proof" - "github.com/google/uuid" "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/go-statestore" proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" "github.com/filecoin-project/specs-storage/storage" diff --git a/extern/sector-storage/mock/mock.go b/extern/sector-storage/mock/mock.go index e50780d1c..0f9bbc9af 100644 --- a/extern/sector-storage/mock/mock.go +++ b/extern/sector-storage/mock/mock.go @@ -10,16 +10,16 @@ import ( "math/rand" "sync" - prooftypes "github.com/filecoin-project/go-state-types/proof" + "github.com/ipfs/go-cid" + logging "github.com/ipfs/go-log/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/dagstore/mount" ffiwrapper2 "github.com/filecoin-project/go-commp-utils/ffiwrapper" commcid "github.com/filecoin-project/go-fil-commcid" "github.com/filecoin-project/go-state-types/abi" + prooftypes "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" - "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log/v2" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" diff --git a/extern/sector-storage/partialfile/partialfile.go b/extern/sector-storage/partialfile/partialfile.go index ffc3935ac..49f84fe81 100644 --- a/extern/sector-storage/partialfile/partialfile.go +++ b/extern/sector-storage/partialfile/partialfile.go @@ -7,6 +7,7 @@ import ( "syscall" "github.com/detailyang/go-fallocate" + logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" @@ -14,8 +15,6 @@ import ( "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - - logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("partialfile") diff --git a/extern/sector-storage/piece_provider_test.go b/extern/sector-storage/piece_provider_test.go index a529a7289..7a67cf9ad 100644 --- a/extern/sector-storage/piece_provider_test.go +++ b/extern/sector-storage/piece_provider_test.go @@ -10,10 +10,6 @@ import ( "os" "testing" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-statestore" - "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" - specstorage "github.com/filecoin-project/specs-storage/storage" "github.com/gorilla/mux" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" @@ -22,6 +18,11 @@ import ( logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-statestore" + specstorage "github.com/filecoin-project/specs-storage/storage" + + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" ) diff --git a/extern/sector-storage/piece_reader.go b/extern/sector-storage/piece_reader.go index 882a2a6d9..56e19142c 100644 --- a/extern/sector-storage/piece_reader.go +++ b/extern/sector-storage/piece_reader.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/dagstore/mount" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/metrics" ) diff --git a/extern/sector-storage/sched_test.go b/extern/sector-storage/sched_test.go index c27330d44..dc87bc744 100644 --- a/extern/sector-storage/sched_test.go +++ b/extern/sector-storage/sched_test.go @@ -11,20 +11,19 @@ import ( "testing" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - "github.com/google/uuid" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-state-types/abi" + prooftypes "github.com/filecoin-project/go-state-types/proof" + "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/specs-storage/storage" ) func init() { diff --git a/extern/sector-storage/stores/http_handler.go b/extern/sector-storage/stores/http_handler.go index af2cac020..6667b1662 100644 --- a/extern/sector-storage/stores/http_handler.go +++ b/extern/sector-storage/stores/http_handler.go @@ -13,11 +13,11 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/extern/sector-storage/partialfile" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/tarutil" - - "github.com/filecoin-project/specs-storage/storage" ) var log = logging.Logger("stores") diff --git a/extern/sector-storage/stores/http_handler_test.go b/extern/sector-storage/stores/http_handler_test.go index 257807574..3533e4f4e 100644 --- a/extern/sector-storage/stores/http_handler_test.go +++ b/extern/sector-storage/stores/http_handler_test.go @@ -9,15 +9,17 @@ import ( "path/filepath" "testing" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/extern/sector-storage/partialfile" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores/mocks" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/specs-storage/storage" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/require" - "golang.org/x/xerrors" ) func TestRemoteGetAllocated(t *testing.T) { diff --git a/extern/sector-storage/stores/local.go b/extern/sector-storage/stores/local.go index 722f8c0d4..549a8d4ec 100644 --- a/extern/sector-storage/stores/local.go +++ b/extern/sector-storage/stores/local.go @@ -11,12 +11,11 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/proof" - "golang.org/x/xerrors" ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" diff --git a/extern/sector-storage/stores/local_test.go b/extern/sector-storage/stores/local_test.go index 1513bf07a..913a73b77 100644 --- a/extern/sector-storage/stores/local_test.go +++ b/extern/sector-storage/stores/local_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" - "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/google/uuid" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" ) const pathSize = 16 << 20 diff --git a/extern/sector-storage/stores/mocks/index.go b/extern/sector-storage/stores/mocks/index.go index 26b98766e..b194d0d84 100644 --- a/extern/sector-storage/stores/mocks/index.go +++ b/extern/sector-storage/stores/mocks/index.go @@ -8,10 +8,12 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + abi "github.com/filecoin-project/go-state-types/abi" + fsutil "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" storiface "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - gomock "github.com/golang/mock/gomock" ) // MockSectorIndex is a mock of SectorIndex interface. diff --git a/extern/sector-storage/stores/mocks/pf.go b/extern/sector-storage/stores/mocks/pf.go index 175e3c119..5e8fe62cc 100644 --- a/extern/sector-storage/stores/mocks/pf.go +++ b/extern/sector-storage/stores/mocks/pf.go @@ -8,10 +8,12 @@ import ( os "os" reflect "reflect" + gomock "github.com/golang/mock/gomock" + abi "github.com/filecoin-project/go-state-types/abi" + partialfile "github.com/filecoin-project/lotus/extern/sector-storage/partialfile" storiface "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - gomock "github.com/golang/mock/gomock" ) // MockPartialFileHandler is a mock of PartialFileHandler interface. diff --git a/extern/sector-storage/stores/mocks/store.go b/extern/sector-storage/stores/mocks/store.go index fbb9deefa..2377433ee 100644 --- a/extern/sector-storage/stores/mocks/store.go +++ b/extern/sector-storage/stores/mocks/store.go @@ -8,11 +8,13 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + abi "github.com/filecoin-project/go-state-types/abi" + storage "github.com/filecoin-project/specs-storage/storage" + fsutil "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" storiface "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - storage "github.com/filecoin-project/specs-storage/storage" - gomock "github.com/golang/mock/gomock" ) // MockStore is a mock of Store interface. diff --git a/extern/sector-storage/stores/remote.go b/extern/sector-storage/stores/remote.go index e8e008139..989e913ee 100644 --- a/extern/sector-storage/stores/remote.go +++ b/extern/sector-storage/stores/remote.go @@ -17,15 +17,15 @@ import ( "strings" "sync" - "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" - "github.com/filecoin-project/lotus/extern/sector-storage/storiface" - "github.com/filecoin-project/lotus/extern/sector-storage/tarutil" + "github.com/hashicorp/go-multierror" + "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-storage/storage" - "github.com/hashicorp/go-multierror" - "golang.org/x/xerrors" + "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" + "github.com/filecoin-project/lotus/extern/sector-storage/tarutil" ) var FetchTempSubdir = "fetching" diff --git a/extern/sector-storage/stores/remote_test.go b/extern/sector-storage/stores/remote_test.go index 2849084b2..1b6160a8f 100644 --- a/extern/sector-storage/stores/remote_test.go +++ b/extern/sector-storage/stores/remote_test.go @@ -21,12 +21,13 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/extern/sector-storage/partialfile" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores/mocks" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/specs-storage/storage" ) const metaFile = "sectorstore.json" diff --git a/extern/sector-storage/storiface/index.go b/extern/sector-storage/storiface/index.go index b157803d2..d198c91f6 100644 --- a/extern/sector-storage/storiface/index.go +++ b/extern/sector-storage/storiface/index.go @@ -4,6 +4,7 @@ import ( "strings" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" ) diff --git a/extern/sector-storage/storiface/resources.go b/extern/sector-storage/storiface/resources.go index 0e3294756..cd55924d5 100644 --- a/extern/sector-storage/storiface/resources.go +++ b/extern/sector-storage/storiface/resources.go @@ -9,6 +9,7 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" ) diff --git a/extern/sector-storage/storiface/resources_test.go b/extern/sector-storage/storiface/resources_test.go index bf7425d24..fd0359116 100644 --- a/extern/sector-storage/storiface/resources_test.go +++ b/extern/sector-storage/storiface/resources_test.go @@ -4,9 +4,11 @@ import ( "fmt" "testing" - stabi "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" "github.com/stretchr/testify/require" + + stabi "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" ) func TestListResourceVars(t *testing.T) { diff --git a/extern/sector-storage/storiface/worker.go b/extern/sector-storage/storiface/worker.go index e325908cc..d5a243fc7 100644 --- a/extern/sector-storage/storiface/worker.go +++ b/extern/sector-storage/storiface/worker.go @@ -6,12 +6,11 @@ import ( "fmt" "time" - "github.com/filecoin-project/go-state-types/proof" - "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" diff --git a/extern/sector-storage/tarutil/systar.go b/extern/sector-storage/tarutil/systar.go index f67cc44fa..2d7bc34a5 100644 --- a/extern/sector-storage/tarutil/systar.go +++ b/extern/sector-storage/tarutil/systar.go @@ -7,9 +7,8 @@ import ( "os" "path/filepath" - "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" + "golang.org/x/xerrors" ) var log = logging.Logger("tarutil") // nolint diff --git a/extern/sector-storage/testworker_test.go b/extern/sector-storage/testworker_test.go index 546a7902a..608a6d5c5 100644 --- a/extern/sector-storage/testworker_test.go +++ b/extern/sector-storage/testworker_test.go @@ -4,11 +4,12 @@ import ( "context" "sync" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-storage/storage" "github.com/google/uuid" cid "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/extern/sector-storage/mock" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/stores" diff --git a/extern/sector-storage/worker_calltracker.go b/extern/sector-storage/worker_calltracker.go index 6f03c72cc..049c604c1 100644 --- a/extern/sector-storage/worker_calltracker.go +++ b/extern/sector-storage/worker_calltracker.go @@ -4,10 +4,11 @@ import ( "fmt" "io" - "github.com/filecoin-project/go-statestore" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" + "github.com/filecoin-project/go-statestore" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" ) diff --git a/extern/sector-storage/worker_local.go b/extern/sector-storage/worker_local.go index 055166cb1..13e00a414 100644 --- a/extern/sector-storage/worker_local.go +++ b/extern/sector-storage/worker_local.go @@ -11,8 +11,6 @@ import ( "sync/atomic" "time" - "github.com/filecoin-project/go-state-types/proof" - "github.com/elastic/go-sysinfo" "github.com/google/uuid" "github.com/hashicorp/go-multierror" @@ -21,6 +19,7 @@ import ( ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/go-statestore" "github.com/filecoin-project/specs-storage/storage" diff --git a/extern/storage-sealing/cbor_gen.go b/extern/storage-sealing/cbor_gen.go index 8b66619e3..e75ba08ed 100644 --- a/extern/storage-sealing/cbor_gen.go +++ b/extern/storage-sealing/cbor_gen.go @@ -8,12 +8,14 @@ import ( "math" "sort" - abi "github.com/filecoin-project/go-state-types/abi" - miner "github.com/filecoin-project/go-state-types/builtin/v8/miner" - api "github.com/filecoin-project/lotus/api" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + abi "github.com/filecoin-project/go-state-types/abi" + miner "github.com/filecoin-project/go-state-types/builtin/v8/miner" + + api "github.com/filecoin-project/lotus/api" ) var _ = xerrors.Errorf diff --git a/extern/storage-sealing/checks.go b/extern/storage-sealing/checks.go index 4aa00c34e..db6cae754 100644 --- a/extern/storage-sealing/checks.go +++ b/extern/storage-sealing/checks.go @@ -4,16 +4,15 @@ import ( "bytes" "context" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/lotus/chain/actors/policy" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-commp-utils/zerocomm" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" + prooftypes "github.com/filecoin-project/go-state-types/proof" + + "github.com/filecoin-project/lotus/chain/actors/policy" ) // TODO: For now we handle this by halting state execution, when we get jsonrpc reconnecting diff --git a/extern/storage-sealing/commit_batch.go b/extern/storage-sealing/commit_batch.go index f2a665293..09f122fe9 100644 --- a/extern/storage-sealing/commit_batch.go +++ b/extern/storage-sealing/commit_batch.go @@ -7,8 +7,6 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/proof" - "github.com/ipfs/go-cid" "golang.org/x/xerrors" @@ -19,6 +17,8 @@ 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/network" + "github.com/filecoin-project/go-state-types/proof" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" diff --git a/extern/storage-sealing/commit_batch_test.go b/extern/storage-sealing/commit_batch_test.go index 17988ed92..59a79d459 100644 --- a/extern/storage-sealing/commit_batch_test.go +++ b/extern/storage-sealing/commit_batch_test.go @@ -9,24 +9,23 @@ import ( "testing" "time" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/network" + prooftypes "github.com/filecoin-project/go-state-types/proof" + miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/extern/storage-sealing/mocks" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" ) func TestCommitBatcher(t *testing.T) { diff --git a/extern/storage-sealing/currentdealinfo.go b/extern/storage-sealing/currentdealinfo.go index 542792696..ec608c385 100644 --- a/extern/storage-sealing/currentdealinfo.go +++ b/extern/storage-sealing/currentdealinfo.go @@ -5,18 +5,18 @@ import ( "context" "fmt" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - - "github.com/filecoin-project/go-state-types/network" + "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" - "golang.org/x/xerrors" ) type CurrentDealInfoAPI interface { diff --git a/extern/storage-sealing/currentdealinfo_test.go b/extern/storage-sealing/currentdealinfo_test.go index 5f889467a..f8a4b2850 100644 --- a/extern/storage-sealing/currentdealinfo_test.go +++ b/extern/storage-sealing/currentdealinfo_test.go @@ -8,28 +8,25 @@ import ( "testing" "time" - "github.com/filecoin-project/go-bitfield" - - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - - "github.com/filecoin-project/go-state-types/network" - - market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" - + "github.com/ipfs/go-cid" + "github.com/stretchr/testify/require" "golang.org/x/net/context" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" + market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" + tutils "github.com/filecoin-project/specs-actors/v2/support/testing" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin/market" evtmock "github.com/filecoin-project/lotus/chain/events/state/mock" "github.com/filecoin-project/lotus/chain/types" - tutils "github.com/filecoin-project/specs-actors/v2/support/testing" - "github.com/ipfs/go-cid" - "github.com/stretchr/testify/require" ) var errNotFound = errors.New("could not find") diff --git a/extern/storage-sealing/fsm_events.go b/extern/storage-sealing/fsm_events.go index 621b90aaf..63252688e 100644 --- a/extern/storage-sealing/fsm_events.go +++ b/extern/storage-sealing/fsm_events.go @@ -8,9 +8,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/specs-storage/storage" ) type mutator interface { diff --git a/extern/storage-sealing/fsm_test.go b/extern/storage-sealing/fsm_test.go index f3012a400..53f85d1dc 100644 --- a/extern/storage-sealing/fsm_test.go +++ b/extern/storage-sealing/fsm_test.go @@ -3,11 +3,11 @@ package sealing import ( "testing" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-statemachine" ) diff --git a/extern/storage-sealing/input.go b/extern/storage-sealing/input.go index ca7ae7dd3..f34277d90 100644 --- a/extern/storage-sealing/input.go +++ b/extern/storage-sealing/input.go @@ -5,15 +5,14 @@ import ( "sort" "time" - "github.com/filecoin-project/go-padreader" - "github.com/filecoin-project/go-statemachine" "github.com/ipfs/go-cid" - "golang.org/x/xerrors" "github.com/filecoin-project/go-commp-utils/zerocomm" + "github.com/filecoin-project/go-padreader" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-statemachine" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/api" diff --git a/extern/storage-sealing/mocks/api.go b/extern/storage-sealing/mocks/api.go index cd1b66d34..db7bad01f 100644 --- a/extern/storage-sealing/mocks/api.go +++ b/extern/storage-sealing/mocks/api.go @@ -8,6 +8,9 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + cid "github.com/ipfs/go-cid" + address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" abi "github.com/filecoin-project/go-state-types/abi" @@ -17,11 +20,10 @@ import ( crypto "github.com/filecoin-project/go-state-types/crypto" dline "github.com/filecoin-project/go-state-types/dline" network "github.com/filecoin-project/go-state-types/network" + api "github.com/filecoin-project/lotus/api" types "github.com/filecoin-project/lotus/chain/types" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - gomock "github.com/golang/mock/gomock" - cid "github.com/ipfs/go-cid" ) // MockSealingAPI is a mock of SealingAPI interface. diff --git a/extern/storage-sealing/mocks/mock_commit_batcher.go b/extern/storage-sealing/mocks/mock_commit_batcher.go index 7285f7ea5..80e6d0655 100644 --- a/extern/storage-sealing/mocks/mock_commit_batcher.go +++ b/extern/storage-sealing/mocks/mock_commit_batcher.go @@ -8,15 +8,17 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + cid "github.com/ipfs/go-cid" + address "github.com/filecoin-project/go-address" abi "github.com/filecoin-project/go-state-types/abi" big "github.com/filecoin-project/go-state-types/big" miner "github.com/filecoin-project/go-state-types/builtin/v8/miner" network "github.com/filecoin-project/go-state-types/network" + api "github.com/filecoin-project/lotus/api" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - gomock "github.com/golang/mock/gomock" - cid "github.com/ipfs/go-cid" ) // MockCommitBatcherApi is a mock of CommitBatcherApi interface. diff --git a/extern/storage-sealing/mocks/mock_precommit_batcher.go b/extern/storage-sealing/mocks/mock_precommit_batcher.go index 914fcd56d..eae9c8339 100644 --- a/extern/storage-sealing/mocks/mock_precommit_batcher.go +++ b/extern/storage-sealing/mocks/mock_precommit_batcher.go @@ -8,14 +8,16 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" + cid "github.com/ipfs/go-cid" + address "github.com/filecoin-project/go-address" abi "github.com/filecoin-project/go-state-types/abi" big "github.com/filecoin-project/go-state-types/big" network "github.com/filecoin-project/go-state-types/network" + api "github.com/filecoin-project/lotus/api" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - gomock "github.com/golang/mock/gomock" - cid "github.com/ipfs/go-cid" ) // MockPreCommitBatcherApi is a mock of PreCommitBatcherApi interface. diff --git a/extern/storage-sealing/precommit_batch.go b/extern/storage-sealing/precommit_batch.go index 02cce8c38..dd93175ca 100644 --- a/extern/storage-sealing/precommit_batch.go +++ b/extern/storage-sealing/precommit_batch.go @@ -7,20 +7,18 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/network" - "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "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/network" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" diff --git a/extern/storage-sealing/precommit_batch_test.go b/extern/storage-sealing/precommit_batch_test.go index e2cea330e..29e02650e 100644 --- a/extern/storage-sealing/precommit_batch_test.go +++ b/extern/storage-sealing/precommit_batch_test.go @@ -9,18 +9,15 @@ import ( "testing" "time" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - - miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - - "github.com/filecoin-project/go-state-types/network" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/go-state-types/network" + miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" diff --git a/extern/storage-sealing/precommit_policy.go b/extern/storage-sealing/precommit_policy.go index b215e5844..35b98baa7 100644 --- a/extern/storage-sealing/precommit_policy.go +++ b/extern/storage-sealing/precommit_policy.go @@ -8,6 +8,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/policy" ) diff --git a/extern/storage-sealing/precommit_policy_test.go b/extern/storage-sealing/precommit_policy_test.go index d4fa3eae4..38553d461 100644 --- a/extern/storage-sealing/precommit_policy_test.go +++ b/extern/storage-sealing/precommit_policy_test.go @@ -5,20 +5,20 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/network" - 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" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" - "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" commcid "github.com/filecoin-project/go-fil-commcid" "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/build" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/policy" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" + "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" ) type fakeChain struct { diff --git a/extern/storage-sealing/sealing.go b/extern/storage-sealing/sealing.go index 509e267c4..c7b156b16 100644 --- a/extern/storage-sealing/sealing.go +++ b/extern/storage-sealing/sealing.go @@ -6,28 +6,26 @@ import ( "sync" "time" - lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-bitfield" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/namespace" logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-statemachine" "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin/market" + lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/types" sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" diff --git a/extern/storage-sealing/states_failed.go b/extern/storage-sealing/states_failed.go index c94752552..a5860b84c 100644 --- a/extern/storage-sealing/states_failed.go +++ b/extern/storage-sealing/states_failed.go @@ -8,14 +8,13 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - + "github.com/filecoin-project/go-commp-utils/zerocomm" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine" - "github.com/filecoin-project/go-commp-utils/zerocomm" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" ) const minRetryTime = 1 * time.Minute diff --git a/extern/storage-sealing/states_failed_test.go b/extern/storage-sealing/states_failed_test.go index 9b28f35b1..9aef97b28 100644 --- a/extern/storage-sealing/states_failed_test.go +++ b/extern/storage-sealing/states_failed_test.go @@ -6,11 +6,6 @@ import ( "context" "testing" - "github.com/filecoin-project/go-state-types/network" - statemachine "github.com/filecoin-project/go-statemachine" - - market0 "github.com/filecoin-project/specs-actors/actors/builtin/market" - "github.com/golang/mock/gomock" "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" @@ -19,6 +14,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "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" + 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" diff --git a/extern/storage-sealing/states_proving.go b/extern/storage-sealing/states_proving.go index 99e69d0fa..8afa08719 100644 --- a/extern/storage-sealing/states_proving.go +++ b/extern/storage-sealing/states_proving.go @@ -7,6 +7,7 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" statemachine "github.com/filecoin-project/go-statemachine" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/policy" ) diff --git a/extern/storage-sealing/states_replica_update.go b/extern/storage-sealing/states_replica_update.go index 186997553..eaecea180 100644 --- a/extern/storage-sealing/states_replica_update.go +++ b/extern/storage-sealing/states_replica_update.go @@ -5,15 +5,17 @@ import ( "context" "time" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "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" + api "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/policy" - "golang.org/x/xerrors" ) func (m *Sealing) handleReplicaUpdate(ctx statemachine.Context, sector SectorInfo) error { diff --git a/extern/storage-sealing/states_sealing.go b/extern/storage-sealing/states_sealing.go index 384484c38..4ce82fa2b 100644 --- a/extern/storage-sealing/states_sealing.go +++ b/extern/storage-sealing/states_sealing.go @@ -4,22 +4,21 @@ import ( "bytes" "context" - "github.com/filecoin-project/go-state-types/proof" - "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-commp-utils/zerocomm" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "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/crypto" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/go-statemachine" "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/go-state-types/builtin" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/policy" diff --git a/extern/storage-sealing/types.go b/extern/storage-sealing/types.go index f03843f5b..28002e8cb 100644 --- a/extern/storage-sealing/types.go +++ b/extern/storage-sealing/types.go @@ -8,10 +8,10 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" diff --git a/extern/storage-sealing/types_test.go b/extern/storage-sealing/types_test.go index ae8569717..e57900960 100644 --- a/extern/storage-sealing/types_test.go +++ b/extern/storage-sealing/types_test.go @@ -4,16 +4,15 @@ import ( "bytes" "testing" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - "github.com/ipfs/go-cid" - "gotest.tools/assert" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" - api "github.com/filecoin-project/lotus/api" + 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" ) func TestSectorInfoSerialization(t *testing.T) { diff --git a/extern/storage-sealing/utils_test.go b/extern/storage-sealing/utils_test.go index e346b6dc9..fb9548a28 100644 --- a/extern/storage-sealing/utils_test.go +++ b/extern/storage-sealing/utils_test.go @@ -3,9 +3,9 @@ package sealing import ( "testing" - "github.com/filecoin-project/go-state-types/abi" - "github.com/stretchr/testify/assert" + + "github.com/filecoin-project/go-state-types/abi" ) func testFill(t *testing.T, n abi.UnpaddedPieceSize, exp []abi.UnpaddedPieceSize) { diff --git a/gateway/handler.go b/gateway/handler.go index 12dded40e..648065a44 100644 --- a/gateway/handler.go +++ b/gateway/handler.go @@ -8,15 +8,17 @@ import ( "time" "contrib.go.opencensus.io/exporter/prometheus" + "github.com/gorilla/mux" + promclient "github.com/prometheus/client_golang/prometheus" + "golang.org/x/time/rate" + "github.com/filecoin-project/go-jsonrpc" + lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/metrics/proxy" "github.com/filecoin-project/lotus/node" - "github.com/gorilla/mux" - promclient "github.com/prometheus/client_golang/prometheus" - "golang.org/x/time/rate" ) type perConnLimiterKeyType string diff --git a/gateway/node.go b/gateway/node.go index 1992c53b7..7e84092e3 100644 --- a/gateway/node.go +++ b/gateway/node.go @@ -17,6 +17,7 @@ import ( "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/api" apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/build" diff --git a/gen/main.go b/gen/main.go index 1118f9716..9cb685740 100644 --- a/gen/main.go +++ b/gen/main.go @@ -4,14 +4,13 @@ import ( "fmt" "os" - "github.com/filecoin-project/lotus/chain/vm" - gen "github.com/whyrusleeping/cbor-gen" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/exchange" "github.com/filecoin-project/lotus/chain/market" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/cmd/lotus-shed/shedgen" sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" diff --git a/genesis/types.go b/genesis/types.go index 1a4bbec41..327a164f5 100644 --- a/genesis/types.go +++ b/genesis/types.go @@ -3,14 +3,15 @@ package genesis import ( "encoding/json" - "github.com/filecoin-project/lotus/chain/wallet" + "github.com/ipfs/go-cid" + "github.com/libp2p/go-libp2p-core/peer" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/network" - "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + + "github.com/filecoin-project/lotus/chain/wallet" ) type ActorType string diff --git a/itests/api_test.go b/itests/api_test.go index ad39f8879..996461ccb 100644 --- a/itests/api_test.go +++ b/itests/api_test.go @@ -7,16 +7,17 @@ import ( "testing" "time" + logging "github.com/ipfs/go-log/v2" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/stretchr/testify/require" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - logging "github.com/ipfs/go-log/v2" ) func TestAPI(t *testing.T) { diff --git a/itests/batch_deal_test.go b/itests/batch_deal_test.go index b3c77fcba..d1a322412 100644 --- a/itests/batch_deal_test.go +++ b/itests/batch_deal_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/stretchr/testify/require" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" "github.com/filecoin-project/lotus/itests/kit" diff --git a/itests/ccupgrade_test.go b/itests/ccupgrade_test.go index 463470385..880c4f309 100644 --- a/itests/ccupgrade_test.go +++ b/itests/ccupgrade_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/network" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" ) diff --git a/itests/deadlines_test.go b/itests/deadlines_test.go index 2b6d94143..1a0f94711 100644 --- a/itests/deadlines_test.go +++ b/itests/deadlines_test.go @@ -7,15 +7,20 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/ipfs/go-cid" + cbor "github.com/ipfs/go-ipld-cbor" + "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" + miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" @@ -26,10 +31,6 @@ import ( "github.com/filecoin-project/lotus/extern/sector-storage/mock" "github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/node/impl" - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" - "github.com/ipfs/go-cid" - cbor "github.com/ipfs/go-ipld-cbor" - "github.com/stretchr/testify/require" ) // TestDeadlineToggling: diff --git a/itests/deals_512mb_test.go b/itests/deals_512mb_test.go index 8c3aea655..e3817fae1 100644 --- a/itests/deals_512mb_test.go +++ b/itests/deals_512mb_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/abi" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/itests/kit" ) diff --git a/itests/deals_anycid_test.go b/itests/deals_anycid_test.go index 03317596b..0799b8d5d 100644 --- a/itests/deals_anycid_test.go +++ b/itests/deals_anycid_test.go @@ -7,15 +7,14 @@ import ( "testing" "time" - selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" - - "github.com/filecoin-project/go-state-types/abi" ipld "github.com/ipfs/go-ipld-format" "github.com/ipld/go-car" "github.com/ipld/go-car/v2/blockstore" + selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/itests/kit" diff --git a/itests/deals_invalid_utf8_label_test.go b/itests/deals_invalid_utf8_label_test.go index 7a4e79150..cec6fb4c3 100644 --- a/itests/deals_invalid_utf8_label_test.go +++ b/itests/deals_invalid_utf8_label_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) // The following function will generate and print out the hex encoding of PublishStorageDealsParams with a dealLabel with invalid utf8 encoding. diff --git a/itests/deals_max_staging_deals_test.go b/itests/deals_max_staging_deals_test.go index fd18c4de0..7b71d09be 100644 --- a/itests/deals_max_staging_deals_test.go +++ b/itests/deals_max_staging_deals_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/abi" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/itests/kit" ) diff --git a/itests/deals_offline_test.go b/itests/deals_offline_test.go index bb2549026..ccd86dff9 100644 --- a/itests/deals_offline_test.go +++ b/itests/deals_offline_test.go @@ -7,13 +7,15 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + commcid "github.com/filecoin-project/go-fil-commcid" commp "github.com/filecoin-project/go-fil-commp-hashhash" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestOfflineDealFlow(t *testing.T) { diff --git a/itests/deals_padding_test.go b/itests/deals_padding_test.go index 2b0dd0d17..93da33210 100644 --- a/itests/deals_padding_test.go +++ b/itests/deals_padding_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + commcid "github.com/filecoin-project/go-fil-commcid" commp "github.com/filecoin-project/go-fil-commp-hashhash" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestDealPadding(t *testing.T) { diff --git a/itests/deals_partial_retrieval_dm-level_test.go b/itests/deals_partial_retrieval_dm-level_test.go index aa92cf731..ff3b7f4f9 100644 --- a/itests/deals_partial_retrieval_dm-level_test.go +++ b/itests/deals_partial_retrieval_dm-level_test.go @@ -9,16 +9,18 @@ import ( "testing" "time" - "github.com/filecoin-project/go-fil-markets/storagemarket" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/api" - api0 "github.com/filecoin-project/lotus/api/v0api" - "github.com/filecoin-project/lotus/itests/kit" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/ipld/go-car" textselector "github.com/ipld/go-ipld-selector-text-lite" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api" + api0 "github.com/filecoin-project/lotus/api/v0api" + "github.com/filecoin-project/lotus/itests/kit" ) // please talk to @ribasushi or @mikeal before modifying these test: there are diff --git a/itests/deals_partial_retrieval_test.go b/itests/deals_partial_retrieval_test.go index e1be43637..98c709bf0 100644 --- a/itests/deals_partial_retrieval_test.go +++ b/itests/deals_partial_retrieval_test.go @@ -10,17 +10,18 @@ import ( "testing" "time" + blocks "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" + "github.com/ipld/go-car" + "github.com/stretchr/testify/require" "golang.org/x/xerrors" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/itests/kit" - blocks "github.com/ipfs/go-block-format" - "github.com/ipfs/go-cid" - "github.com/ipld/go-car" - "github.com/stretchr/testify/require" ) // use the mainnet carfile as text fixture: it will always be here diff --git a/itests/deals_pricing_test.go b/itests/deals_pricing_test.go index b1f1d7e5d..f544a58ef 100644 --- a/itests/deals_pricing_test.go +++ b/itests/deals_pricing_test.go @@ -6,10 +6,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/extern/sector-storage/storiface" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestQuotePriceForUnsealedRetrieval(t *testing.T) { diff --git a/itests/deals_publish_test.go b/itests/deals_publish_test.go index 8d707c235..bd4a3d1c0 100644 --- a/itests/deals_publish_test.go +++ b/itests/deals_publish_test.go @@ -7,8 +7,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" + market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/types" @@ -19,8 +23,6 @@ import ( "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/storage" - market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" - "github.com/stretchr/testify/require" ) func TestPublishDealsBatching(t *testing.T) { diff --git a/itests/deals_retry_deal_no_funds_test.go b/itests/deals_retry_deal_no_funds_test.go index cf52d6f55..f0582a363 100644 --- a/itests/deals_retry_deal_no_funds_test.go +++ b/itests/deals_retry_deal_no_funds_test.go @@ -6,7 +6,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/itests/kit" @@ -15,7 +18,6 @@ import ( "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/storage" - "github.com/stretchr/testify/require" ) var ( diff --git a/itests/gateway_test.go b/itests/gateway_test.go index ce31a0a36..934b88fd2 100644 --- a/itests/gateway_test.go +++ b/itests/gateway_test.go @@ -10,9 +10,16 @@ import ( "testing" "time" + "github.com/ipfs/go-cid" + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-state-types/abi" + init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" + multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/client" "github.com/filecoin-project/lotus/chain/stmgr" @@ -22,13 +29,6 @@ import ( "github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/itests/multisig" "github.com/filecoin-project/lotus/node" - - init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" - multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" - - "github.com/ipfs/go-cid" - "github.com/stretchr/testify/require" - "golang.org/x/xerrors" ) const ( diff --git a/itests/get_messages_in_ts_test.go b/itests/get_messages_in_ts_test.go index b5ef0387e..f5efa1bb8 100644 --- a/itests/get_messages_in_ts_test.go +++ b/itests/get_messages_in_ts_test.go @@ -4,16 +4,16 @@ package itests import ( "context" "testing" + "time" + + "github.com/stretchr/testify/require" + + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" - - "time" - - "github.com/filecoin-project/go-state-types/big" ) func TestChainGetMessagesInTs(t *testing.T) { diff --git a/itests/kit/blockminer.go b/itests/kit/blockminer.go index aa1658dfe..bbcc5a8d4 100644 --- a/itests/kit/blockminer.go +++ b/itests/kit/blockminer.go @@ -9,16 +9,17 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/stretchr/testify/require" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/dline" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/miner" - "github.com/stretchr/testify/require" ) // BlockMiner is a utility that makes a test miner Mine blocks on a timer. diff --git a/itests/kit/client.go b/itests/kit/client.go index 8b03617f6..f29fecfeb 100644 --- a/itests/kit/client.go +++ b/itests/kit/client.go @@ -12,12 +12,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + lcli "github.com/urfave/cli/v2" + + "github.com/filecoin-project/specs-actors/v2/actors/builtin" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/stretchr/testify/require" - lcli "github.com/urfave/cli/v2" ) // RunClientTest exercises some of the Client CLI commands diff --git a/itests/kit/control.go b/itests/kit/control.go index e1954c56c..de0cab48c 100644 --- a/itests/kit/control.go +++ b/itests/kit/control.go @@ -3,12 +3,11 @@ package kit import ( "context" - "github.com/filecoin-project/go-state-types/builtin" - "github.com/stretchr/testify/require" addr "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors" diff --git a/itests/kit/deals.go b/itests/kit/deals.go index 44f785d3d..e256438d0 100644 --- a/itests/kit/deals.go +++ b/itests/kit/deals.go @@ -10,14 +10,6 @@ import ( "testing" "time" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - "github.com/filecoin-project/go-fil-markets/shared_testutil" - "github.com/filecoin-project/go-fil-markets/storagemarket" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/types" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/ipfs/go-cid" files "github.com/ipfs/go-ipfs-files" ipld "github.com/ipfs/go-ipld-format" @@ -27,6 +19,16 @@ import ( "github.com/ipld/go-car" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" + + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + "github.com/filecoin-project/go-fil-markets/shared_testutil" + "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" ) type DealHarness struct { diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go index 8273a122b..75b38776a 100644 --- a/itests/kit/ensemble.go +++ b/itests/kit/ensemble.go @@ -12,8 +12,6 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/builtin" - "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" @@ -24,10 +22,13 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-statestore" "github.com/filecoin-project/go-storedcounter" + miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" + power3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/power" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v1api" @@ -59,8 +60,6 @@ import ( testing2 "github.com/filecoin-project/lotus/node/modules/testing" "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/storage/mockstorage" - miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner" - power3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/power" ) func init() { diff --git a/itests/kit/ensemble_opts.go b/itests/kit/ensemble_opts.go index 327da076e..f0a984e4e 100644 --- a/itests/kit/ensemble_opts.go +++ b/itests/kit/ensemble_opts.go @@ -7,7 +7,6 @@ import ( "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/stmgr" - "github.com/filecoin-project/lotus/chain/wallet" ) diff --git a/itests/kit/files.go b/itests/kit/files.go index 26dba1b4b..ca76ad367 100644 --- a/itests/kit/files.go +++ b/itests/kit/files.go @@ -25,7 +25,6 @@ import ( "github.com/ipld/go-car" "github.com/minio/blake2b-simd" mh "github.com/multiformats/go-multihash" - "github.com/stretchr/testify/require" ) diff --git a/itests/kit/funds.go b/itests/kit/funds.go index e49c708ea..1918d9125 100644 --- a/itests/kit/funds.go +++ b/itests/kit/funds.go @@ -4,12 +4,12 @@ import ( "context" "testing" + "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/itests/kit/init.go b/itests/kit/init.go index 33a9ace7d..9397c53a2 100644 --- a/itests/kit/init.go +++ b/itests/kit/init.go @@ -4,9 +4,10 @@ import ( "fmt" "os" + logging "github.com/ipfs/go-log/v2" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - logging "github.com/ipfs/go-log/v2" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/policy" diff --git a/itests/kit/log.go b/itests/kit/log.go index 4ec610baf..2932255d2 100644 --- a/itests/kit/log.go +++ b/itests/kit/log.go @@ -1,8 +1,9 @@ package kit import ( - "github.com/filecoin-project/lotus/lib/lotuslog" logging "github.com/ipfs/go-log/v2" + + "github.com/filecoin-project/lotus/lib/lotuslog" ) func QuietMiningLogs() { diff --git a/itests/kit/mockcli.go b/itests/kit/mockcli.go index 5a09a9af8..b6d345697 100644 --- a/itests/kit/mockcli.go +++ b/itests/kit/mockcli.go @@ -7,10 +7,11 @@ import ( "strings" "testing" - "github.com/filecoin-project/lotus/api" "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" lcli "github.com/urfave/cli/v2" + + "github.com/filecoin-project/lotus/api" ) type MockCLI struct { diff --git a/itests/kit/node_full.go b/itests/kit/node_full.go index 1714e01e0..a4cdd0c7a 100644 --- a/itests/kit/node_full.go +++ b/itests/kit/node_full.go @@ -6,14 +6,16 @@ import ( "testing" "time" + "github.com/multiformats/go-multiaddr" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" - "github.com/multiformats/go-multiaddr" - "github.com/stretchr/testify/require" ) // TestFullNode represents a full node enrolled in an Ensemble. diff --git a/itests/kit/node_miner.go b/itests/kit/node_miner.go index ae77abe5a..6eea1b430 100644 --- a/itests/kit/node_miner.go +++ b/itests/kit/node_miner.go @@ -13,10 +13,14 @@ import ( "time" "github.com/google/uuid" + libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" + "github.com/libp2p/go-libp2p-core/peer" + "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/wallet" @@ -24,9 +28,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/miner" - libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/multiformats/go-multiaddr" ) type MinerSubsystem int diff --git a/itests/kit/node_opts.go b/itests/kit/node_opts.go index 0de640b27..030b94b19 100644 --- a/itests/kit/node_opts.go +++ b/itests/kit/node_opts.go @@ -3,18 +3,18 @@ package kit import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" - "github.com/filecoin-project/lotus/extern/sector-storage/stores" - "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" - "github.com/filecoin-project/lotus/node/config" - "github.com/filecoin-project/lotus/node/modules" - "github.com/filecoin-project/lotus/node/modules/dtypes" - "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" + "github.com/filecoin-project/lotus/extern/sector-storage/stores" + "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" "github.com/filecoin-project/lotus/node" + "github.com/filecoin-project/lotus/node/config" + "github.com/filecoin-project/lotus/node/modules" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/repo" ) // DefaultPresealsPerBootstrapMiner is the number of preseals that every diff --git a/itests/kit/node_worker.go b/itests/kit/node_worker.go index 50aead95b..538c739a7 100644 --- a/itests/kit/node_worker.go +++ b/itests/kit/node_worker.go @@ -6,8 +6,9 @@ import ( "net/http" "testing" - "github.com/filecoin-project/lotus/api" "github.com/multiformats/go-multiaddr" + + "github.com/filecoin-project/lotus/api" ) // TestWorker represents a worker enrolled in an Ensemble. diff --git a/itests/kit/rpc.go b/itests/kit/rpc.go index 9d90c846f..45fb095d5 100644 --- a/itests/kit/rpc.go +++ b/itests/kit/rpc.go @@ -9,10 +9,9 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" - "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" + "github.com/stretchr/testify/require" "github.com/filecoin-project/lotus/api/client" "github.com/filecoin-project/lotus/cmd/lotus-worker/sealworker" diff --git a/itests/lookup_robust_address_test.go b/itests/lookup_robust_address_test.go index d2d49af8b..536d8feef 100644 --- a/itests/lookup_robust_address_test.go +++ b/itests/lookup_robust_address_test.go @@ -5,10 +5,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestStateLookupRobustAddress(t *testing.T) { diff --git a/itests/mempool_test.go b/itests/mempool_test.go index a1c2a330e..2a9905e2d 100644 --- a/itests/mempool_test.go +++ b/itests/mempool_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) const mPoolThrottle = time.Millisecond * 100 diff --git a/itests/multisig/suite.go b/itests/multisig/suite.go index 55400a99c..39edfdc4e 100644 --- a/itests/multisig/suite.go +++ b/itests/multisig/suite.go @@ -7,12 +7,14 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func RunMultisigTests(t *testing.T, client *kit.TestFullNode) { diff --git a/itests/nonce_test.go b/itests/nonce_test.go index e0c247ed6..87ea487ec 100644 --- a/itests/nonce_test.go +++ b/itests/nonce_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestNonceIncremental(t *testing.T) { diff --git a/itests/paych_api_test.go b/itests/paych_api_test.go index cf63f3de3..5144221a1 100644 --- a/itests/paych_api_test.go +++ b/itests/paych_api_test.go @@ -6,16 +6,14 @@ import ( "testing" "time" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/itests/kit" "github.com/ipfs/go-cid" + cbor "github.com/ipfs/go-ipld-cbor" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" - cbor "github.com/ipfs/go-ipld-cbor" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" @@ -27,6 +25,7 @@ import ( "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/events/state" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/itests/kit" ) func TestPaymentChannelsAPI(t *testing.T) { diff --git a/itests/paych_cli_test.go b/itests/paych_cli_test.go index 781be80a8..8892d6819 100644 --- a/itests/paych_cli_test.go +++ b/itests/paych_cli_test.go @@ -11,21 +11,21 @@ import ( "testing" "time" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/cli" - "github.com/filecoin-project/lotus/itests/kit" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors/adt" - "github.com/filecoin-project/lotus/chain/actors/builtin/paych" cbor "github.com/ipfs/go-ipld-cbor" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/adt" + "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/itests/kit" ) // TestPaymentChannelsBasic does a basic test to exercise the payment channel CLI diff --git a/itests/sdr_upgrade_test.go b/itests/sdr_upgrade_test.go index c1198dd0c..a90d0bebe 100644 --- a/itests/sdr_upgrade_test.go +++ b/itests/sdr_upgrade_test.go @@ -8,13 +8,15 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/itests/kit" bminer "github.com/filecoin-project/lotus/miner" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestSDRUpgrade(t *testing.T) { diff --git a/itests/sector_pledge_test.go b/itests/sector_pledge_test.go index a6aa1a7c8..0c76e9076 100644 --- a/itests/sector_pledge_test.go +++ b/itests/sector_pledge_test.go @@ -8,18 +8,19 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/itests/kit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/network" + miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" + "github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/node/impl" - miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" ) func TestPledgeSectors(t *testing.T) { diff --git a/itests/sector_terminate_test.go b/itests/sector_terminate_test.go index 536e51538..fd685dc53 100644 --- a/itests/sector_terminate_test.go +++ b/itests/sector_terminate_test.go @@ -6,12 +6,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/chain/types" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestTerminate(t *testing.T) { diff --git a/itests/self_sent_txn_test.go b/itests/self_sent_txn_test.go index 8d608ba95..978778a8b 100644 --- a/itests/self_sent_txn_test.go +++ b/itests/self_sent_txn_test.go @@ -6,14 +6,15 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/network" + "github.com/stretchr/testify/require" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) // these tests check that the versioned code in vm.transfer is functioning correctly across versions! diff --git a/itests/tape_test.go b/itests/tape_test.go index 79f8961e4..3cb1e8339 100644 --- a/itests/tape_test.go +++ b/itests/tape_test.go @@ -6,12 +6,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/itests/kit" - "github.com/stretchr/testify/require" ) func TestTapeFix(t *testing.T) { diff --git a/itests/verifreg_test.go b/itests/verifreg_test.go index 9efefc7b9..be80043c1 100644 --- a/itests/verifreg_test.go +++ b/itests/verifreg_test.go @@ -8,18 +8,19 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/chain/wallet" - "github.com/filecoin-project/lotus/itests/kit" verifreg4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/verifreg" - "github.com/stretchr/testify/require" lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/builtin/verifreg" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/node/impl" ) diff --git a/itests/wdpost_dispute_test.go b/itests/wdpost_dispute_test.go index b1df48053..f26adb39b 100644 --- a/itests/wdpost_dispute_test.go +++ b/itests/wdpost_dispute_test.go @@ -6,21 +6,21 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" - prooftypes "github.com/filecoin-project/go-state-types/proof" - "github.com/filecoin-project/go-state-types/builtin" minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" + prooftypes "github.com/filecoin-project/go-state-types/proof" + "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/itests/kit" - "github.com/stretchr/testify/require" ) func TestWindowPostDispute(t *testing.T) { diff --git a/itests/worker_test.go b/itests/worker_test.go index e18b4797f..fda8f9901 100644 --- a/itests/worker_test.go +++ b/itests/worker_test.go @@ -7,13 +7,14 @@ import ( "testing" "time" - "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + storage2 "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" @@ -24,7 +25,6 @@ import ( "github.com/filecoin-project/lotus/node/impl" "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/storage" - storage2 "github.com/filecoin-project/specs-storage/storage" ) func TestWorkerPledge(t *testing.T) { diff --git a/journal/alerting/alerts.go b/journal/alerting/alerts.go index b5df2b8ba..b99638f77 100644 --- a/journal/alerting/alerts.go +++ b/journal/alerting/alerts.go @@ -6,8 +6,9 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/journal" logging "github.com/ipfs/go-log/v2" + + "github.com/filecoin-project/lotus/journal" ) var log = logging.Logger("alerting") diff --git a/journal/mockjournal/journal.go b/journal/mockjournal/journal.go index 3668923e5..842c252bd 100644 --- a/journal/mockjournal/journal.go +++ b/journal/mockjournal/journal.go @@ -7,8 +7,9 @@ package mockjournal import ( reflect "reflect" - journal "github.com/filecoin-project/lotus/journal" gomock "github.com/golang/mock/gomock" + + journal "github.com/filecoin-project/lotus/journal" ) // MockJournal is a mock of Journal interface. diff --git a/lib/backupds/datastore.go b/lib/backupds/datastore.go index f0ece10ba..451946079 100644 --- a/lib/backupds/datastore.go +++ b/lib/backupds/datastore.go @@ -7,13 +7,12 @@ import ( "sync" "time" - "go.uber.org/multierr" - "golang.org/x/xerrors" - "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" logging "github.com/ipfs/go-log/v2" cbg "github.com/whyrusleeping/cbor-gen" + "go.uber.org/multierr" + "golang.org/x/xerrors" ) var log = logging.Logger("backupds") diff --git a/lib/backupds/log.go b/lib/backupds/log.go index b89f410f0..eb1174b46 100644 --- a/lib/backupds/log.go +++ b/lib/backupds/log.go @@ -12,9 +12,8 @@ import ( "time" "github.com/google/uuid" - "golang.org/x/xerrors" - "github.com/ipfs/go-datastore" + "golang.org/x/xerrors" ) var loghead = datastore.NewKey("/backupds/log/head") // string([logfile base name];[uuid];[unix ts]) diff --git a/lib/oldpath/oldresolver/resolver.go b/lib/oldpath/oldresolver/resolver.go index e475e29be..f92aaee2e 100644 --- a/lib/oldpath/oldresolver/resolver.go +++ b/lib/oldpath/oldresolver/resolver.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - path "github.com/filecoin-project/lotus/lib/oldpath" - 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" + + path "github.com/filecoin-project/lotus/lib/oldpath" ) var log = logging.Logger("pathresolv") diff --git a/lib/peermgr/peermgr.go b/lib/peermgr/peermgr.go index ee158cc04..6f4cf88d7 100644 --- a/lib/peermgr/peermgr.go +++ b/lib/peermgr/peermgr.go @@ -5,21 +5,20 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/metrics" - "github.com/filecoin-project/lotus/node/modules/dtypes" - "go.opencensus.io/stats" - "go.uber.org/fx" - "go.uber.org/multierr" - "golang.org/x/xerrors" - + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/event" host "github.com/libp2p/go-libp2p-core/host" net "github.com/libp2p/go-libp2p-core/network" peer "github.com/libp2p/go-libp2p-core/peer" dht "github.com/libp2p/go-libp2p-kad-dht" + "go.opencensus.io/stats" + "go.uber.org/fx" + "go.uber.org/multierr" + "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/metrics" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var log = logging.Logger("peermgr") diff --git a/lib/sigs/bls/init.go b/lib/sigs/bls/init.go index 9bc69c3a4..f64912fa8 100644 --- a/lib/sigs/bls/init.go +++ b/lib/sigs/bls/init.go @@ -4,11 +4,10 @@ import ( "crypto/rand" "fmt" + ffi "github.com/filecoin-project/filecoin-ffi" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" - ffi "github.com/filecoin-project/filecoin-ffi" - "github.com/filecoin-project/lotus/lib/sigs" ) diff --git a/lib/sigs/secp/init.go b/lib/sigs/secp/init.go index 674bbbb28..05238fdcd 100644 --- a/lib/sigs/secp/init.go +++ b/lib/sigs/secp/init.go @@ -3,10 +3,11 @@ package secp import ( "fmt" + "github.com/minio/blake2b-simd" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-crypto" crypto2 "github.com/filecoin-project/go-state-types/crypto" - "github.com/minio/blake2b-simd" "github.com/filecoin-project/lotus/lib/sigs" ) diff --git a/lib/sigs/sigs.go b/lib/sigs/sigs.go index 1f56846a8..7792fc023 100644 --- a/lib/sigs/sigs.go +++ b/lib/sigs/sigs.go @@ -4,11 +4,12 @@ import ( "context" "fmt" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/crypto" "go.opencensus.io/trace" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/lib/tracing/setup.go b/lib/tracing/setup.go index d90099f79..a72ecdf23 100644 --- a/lib/tracing/setup.go +++ b/lib/tracing/setup.go @@ -4,6 +4,7 @@ import ( "os" "strings" + logging "github.com/ipfs/go-log/v2" octrace "go.opencensus.io/trace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/bridge/opencensus" @@ -12,8 +13,6 @@ import ( tracesdk "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.7.0" "go.uber.org/zap" - - logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("tracing") diff --git a/lib/ulimit/ulimit.go b/lib/ulimit/ulimit.go index 764cd6874..e900f1213 100644 --- a/lib/ulimit/ulimit.go +++ b/lib/ulimit/ulimit.go @@ -9,9 +9,9 @@ import ( "strconv" "syscall" - "github.com/filecoin-project/lotus/build" - logging "github.com/ipfs/go-log/v2" + + "github.com/filecoin-project/lotus/build" ) var log = logging.Logger("ulimit") diff --git a/lib/unixfs/filestore.go b/lib/unixfs/filestore.go index de9063f61..3a3da418d 100644 --- a/lib/unixfs/filestore.go +++ b/lib/unixfs/filestore.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "os" - "github.com/filecoin-project/go-fil-markets/stores" "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" "github.com/ipfs/go-cidutil" @@ -22,6 +21,8 @@ import ( mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" + "github.com/filecoin-project/go-fil-markets/stores" + "github.com/filecoin-project/lotus/build" ) diff --git a/lotuspond/spawn.go b/lotuspond/spawn.go index 900c372b1..b38d28140 100644 --- a/lotuspond/spawn.go +++ b/lotuspond/spawn.go @@ -11,18 +11,17 @@ import ( "sync/atomic" "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - "github.com/google/uuid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/gen" + genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/cmd/lotus-seed/seed" "github.com/filecoin-project/lotus/genesis" diff --git a/markets/dagstore/miner_api_test.go b/markets/dagstore/miner_api_test.go index f39bcb8de..b30783c5d 100644 --- a/markets/dagstore/miner_api_test.go +++ b/markets/dagstore/miner_api_test.go @@ -10,8 +10,6 @@ import ( "testing" "time" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" @@ -25,6 +23,7 @@ import ( "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-state-types/abi" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" ) const unsealedSectorID = abi.SectorNumber(1) diff --git a/markets/dagstore/mocks/mock_lotus_accessor.go b/markets/dagstore/mocks/mock_lotus_accessor.go index 19923cc2a..3910512cf 100644 --- a/markets/dagstore/mocks/mock_lotus_accessor.go +++ b/markets/dagstore/mocks/mock_lotus_accessor.go @@ -8,9 +8,10 @@ import ( context "context" reflect "reflect" - mount "github.com/filecoin-project/dagstore/mount" gomock "github.com/golang/mock/gomock" cid "github.com/ipfs/go-cid" + + mount "github.com/filecoin-project/dagstore/mount" ) // MockMinerAPI is a mock of MinerAPI interface. diff --git a/markets/dagstore/mount_test.go b/markets/dagstore/mount_test.go index 82cfa7cb8..bc55f449d 100644 --- a/markets/dagstore/mount_test.go +++ b/markets/dagstore/mount_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/dagstore/mount" + mock_dagstore "github.com/filecoin-project/lotus/markets/dagstore/mocks" ) diff --git a/markets/dagstore/wrapper.go b/markets/dagstore/wrapper.go index 1085a53cc..cee4ec886 100644 --- a/markets/dagstore/wrapper.go +++ b/markets/dagstore/wrapper.go @@ -10,30 +10,26 @@ import ( "sync" "time" - "github.com/libp2p/go-libp2p-core/host" - - carindex "github.com/ipld/go-car/v2/index" - "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" levelds "github.com/ipfs/go-ds-leveldb" measure "github.com/ipfs/go-ds-measure" logging "github.com/ipfs/go-log/v2" + carindex "github.com/ipld/go-car/v2/index" + "github.com/libp2p/go-libp2p-core/host" ldbopts "github.com/syndtr/goleveldb/leveldb/opt" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/node/config" - - "github.com/filecoin-project/go-statemachine/fsm" - "github.com/filecoin-project/dagstore" "github.com/filecoin-project/dagstore/index" "github.com/filecoin-project/dagstore/mount" "github.com/filecoin-project/dagstore/shard" - "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket/impl/providerstates" "github.com/filecoin-project/go-fil-markets/stores" + "github.com/filecoin-project/go-statemachine/fsm" + + "github.com/filecoin-project/lotus/node/config" ) const ( diff --git a/markets/dagstore/wrapper_migration_test.go b/markets/dagstore/wrapper_migration_test.go index be723704e..ce208cc82 100644 --- a/markets/dagstore/wrapper_migration_test.go +++ b/markets/dagstore/wrapper_migration_test.go @@ -6,20 +6,17 @@ import ( "io" "testing" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" - "github.com/stretchr/testify/require" "github.com/filecoin-project/dagstore" "github.com/filecoin-project/dagstore/mount" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/testnodes" tut "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/lotus/node/config" ) diff --git a/markets/dagstore/wrapper_test.go b/markets/dagstore/wrapper_test.go index ae99756cf..ebc60372b 100644 --- a/markets/dagstore/wrapper_test.go +++ b/markets/dagstore/wrapper_test.go @@ -8,13 +8,10 @@ import ( "testing" "time" - mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" - - mh "github.com/multiformats/go-multihash" - - carindex "github.com/ipld/go-car/v2/index" - "github.com/ipfs/go-cid" + carindex "github.com/ipld/go-car/v2/index" + mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" + mh "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" "golang.org/x/xerrors" diff --git a/markets/idxprov/mesh.go b/markets/idxprov/mesh.go index af0d11189..6c94fe9f3 100644 --- a/markets/idxprov/mesh.go +++ b/markets/idxprov/mesh.go @@ -4,12 +4,11 @@ import ( "context" "fmt" + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" "github.com/filecoin-project/lotus/api/v1api" - - logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("idxprov") diff --git a/markets/loggers/loggers.go b/markets/loggers/loggers.go index 13a76954b..f522fb6ab 100644 --- a/markets/loggers/loggers.go +++ b/markets/loggers/loggers.go @@ -1,11 +1,12 @@ package marketevents import ( + logging "github.com/ipfs/go-log/v2" + datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" - logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("markets") diff --git a/markets/pricing/cli.go b/markets/pricing/cli.go index 3c2a5f248..48f56628f 100644 --- a/markets/pricing/cli.go +++ b/markets/pricing/cli.go @@ -6,9 +6,11 @@ import ( "encoding/json" "os/exec" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - "github.com/filecoin-project/lotus/node/modules/dtypes" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + + "github.com/filecoin-project/lotus/node/modules/dtypes" ) func ExternalRetrievalPricingFunc(cmd string) dtypes.RetrievalPricingFunc { diff --git a/markets/retrievaladapter/client.go b/markets/retrievaladapter/client.go index e08d78c38..34bc24896 100644 --- a/markets/retrievaladapter/client.go +++ b/markets/retrievaladapter/client.go @@ -3,14 +3,15 @@ package retrievaladapter import ( "context" + "github.com/ipfs/go-cid" + "github.com/multiformats/go-multiaddr" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-cid" - "github.com/multiformats/go-multiaddr" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/impl/full" diff --git a/markets/retrievaladapter/provider.go b/markets/retrievaladapter/provider.go index 31d0acc36..453474d4e 100644 --- a/markets/retrievaladapter/provider.go +++ b/markets/retrievaladapter/provider.go @@ -4,18 +4,18 @@ import ( "context" "github.com/hashicorp/go-multierror" - "golang.org/x/xerrors" - "github.com/ipfs/go-cid" + logging "github.com/ipfs/go-log/v2" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-state-types/abi" paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/chain/types" - logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("retrievaladapter") diff --git a/markets/retrievaladapter/provider_test.go b/markets/retrievaladapter/provider_test.go index 18dfe42a0..0a50a10ac 100644 --- a/markets/retrievaladapter/provider_test.go +++ b/markets/retrievaladapter/provider_test.go @@ -5,17 +5,19 @@ import ( "context" "testing" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" - testnet "github.com/filecoin-project/go-fil-markets/shared_testutil" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/mocks" - "github.com/filecoin-project/lotus/chain/actors/builtin/market" - "github.com/filecoin-project/lotus/chain/types" "github.com/golang/mock/gomock" "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-fil-markets/retrievalmarket" + testnet "github.com/filecoin-project/go-fil-markets/shared_testutil" + "github.com/filecoin-project/go-state-types/abi" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/mocks" + "github.com/filecoin-project/lotus/chain/actors/builtin/market" + "github.com/filecoin-project/lotus/chain/types" ) func TestGetPricingInput(t *testing.T) { diff --git a/markets/storageadapter/api.go b/markets/storageadapter/api.go index 4316174bc..b93ffdfbb 100644 --- a/markets/storageadapter/api.go +++ b/markets/storageadapter/api.go @@ -9,9 +9,9 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/markets/storageadapter/client.go b/markets/storageadapter/client.go index bddd5b4f7..dc6aa37b3 100644 --- a/markets/storageadapter/client.go +++ b/markets/storageadapter/client.go @@ -6,9 +6,6 @@ import ( "bytes" "context" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/ipfs/go-cid" "go.uber.org/fx" "golang.org/x/xerrors" @@ -19,8 +16,10 @@ import ( "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" + builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" diff --git a/markets/storageadapter/client_blockstore.go b/markets/storageadapter/client_blockstore.go index 4239251d3..ff16840ad 100644 --- a/markets/storageadapter/client_blockstore.go +++ b/markets/storageadapter/client_blockstore.go @@ -9,6 +9,7 @@ import ( "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/stores" + "github.com/filecoin-project/lotus/node/repo/imports" ) diff --git a/markets/storageadapter/dealpublisher.go b/markets/storageadapter/dealpublisher.go index 6e6d37bd4..a98da7140 100644 --- a/markets/storageadapter/dealpublisher.go +++ b/markets/storageadapter/dealpublisher.go @@ -14,10 +14,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" diff --git a/markets/storageadapter/dealpublisher_test.go b/markets/storageadapter/dealpublisher_test.go index c0251b2c8..b73c3e2a6 100644 --- a/markets/storageadapter/dealpublisher_test.go +++ b/markets/storageadapter/dealpublisher_test.go @@ -7,16 +7,14 @@ import ( "testing" "time" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - "github.com/ipfs/go-cid" "github.com/raulk/clock" - "golang.org/x/xerrors" - "github.com/stretchr/testify/require" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" tutils "github.com/filecoin-project/specs-actors/v2/support/testing" diff --git a/markets/storageadapter/dealstatematcher.go b/markets/storageadapter/dealstatematcher.go index b8b47ef8e..8d5598eae 100644 --- a/markets/storageadapter/dealstatematcher.go +++ b/markets/storageadapter/dealstatematcher.go @@ -5,6 +5,7 @@ import ( "sync" "github.com/filecoin-project/go-state-types/abi" + actorsmarket "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/events/state" diff --git a/markets/storageadapter/dealstatematcher_test.go b/markets/storageadapter/dealstatematcher_test.go index 755ecaf47..6ff000a2a 100644 --- a/markets/storageadapter/dealstatematcher_test.go +++ b/markets/storageadapter/dealstatematcher_test.go @@ -5,25 +5,21 @@ import ( "context" "testing" - "github.com/filecoin-project/lotus/chain/events" - "golang.org/x/sync/errgroup" - - cbornode "github.com/ipfs/go-ipld-cbor" - - adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" "github.com/ipfs/go-cid" + cbornode "github.com/ipfs/go-ipld-cbor" + "github.com/stretchr/testify/require" + "golang.org/x/sync/errgroup" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - bstore "github.com/filecoin-project/lotus/blockstore" - test "github.com/filecoin-project/lotus/chain/events/state/mock" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" + adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" - "github.com/stretchr/testify/require" - + bstore "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/events/state" + test "github.com/filecoin-project/lotus/chain/events/state/mock" "github.com/filecoin-project/lotus/chain/types" ) diff --git a/markets/storageadapter/ondealsectorcommitted.go b/markets/storageadapter/ondealsectorcommitted.go index 88457b70c..0567a4514 100644 --- a/markets/storageadapter/ondealsectorcommitted.go +++ b/markets/storageadapter/ondealsectorcommitted.go @@ -5,14 +5,11 @@ import ( "context" "sync" - lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - - "github.com/filecoin-project/go-bitfield" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/ipfs/go-cid" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin" @@ -20,8 +17,10 @@ import ( "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/build" + lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/types" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" ) type eventsCalledAPI interface { diff --git a/markets/storageadapter/ondealsectorcommitted_test.go b/markets/storageadapter/ondealsectorcommitted_test.go index 8b420bdd3..458d2209e 100644 --- a/markets/storageadapter/ondealsectorcommitted_test.go +++ b/markets/storageadapter/ondealsectorcommitted_test.go @@ -10,28 +10,26 @@ import ( "testing" "time" - "github.com/filecoin-project/go-state-types/builtin" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" + "github.com/ipfs/go-cid" + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/cbor" + tutils "github.com/filecoin-project/specs-actors/v2/support/testing" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/events" test "github.com/filecoin-project/lotus/chain/events/state/mock" "github.com/filecoin-project/lotus/chain/types" - tutils "github.com/filecoin-project/specs-actors/v2/support/testing" - "github.com/ipfs/go-cid" - "github.com/stretchr/testify/require" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" ) func TestOnDealSectorPreCommitted(t *testing.T) { diff --git a/markets/storageadapter/provider.go b/markets/storageadapter/provider.go index ef8b8b76d..0de8de595 100644 --- a/markets/storageadapter/provider.go +++ b/markets/storageadapter/provider.go @@ -6,8 +6,6 @@ import ( "context" "time" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "go.uber.org/fx" @@ -17,6 +15,7 @@ import ( "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" diff --git a/markets/utils/converters.go b/markets/utils/converters.go index 4a3d21140..9a715b40f 100644 --- a/markets/utils/converters.go +++ b/markets/utils/converters.go @@ -1,14 +1,15 @@ package utils import ( - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/api" peer "github.com/libp2p/go-libp2p-core/peer" "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + + "github.com/filecoin-project/lotus/api" ) func NewStorageProviderInfo(address address.Address, miner address.Address, sectorSize abi.SectorSize, peer peer.ID, addrs []abi.Multiaddrs) storagemarket.StorageProviderInfo { diff --git a/miner/miner.go b/miner/miner.go index 6fbf159bf..8f341166e 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -10,31 +10,27 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/proof" - - lrand "github.com/filecoin-project/lotus/chain/rand" - - "github.com/filecoin-project/lotus/api/v1api" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/actors/policy" - "github.com/filecoin-project/lotus/chain/gen/slashfilter" + lru "github.com/hashicorp/golang-lru" + logging "github.com/ipfs/go-log/v2" + "go.opencensus.io/trace" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" - lru "github.com/hashicorp/golang-lru" + "github.com/filecoin-project/go-state-types/proof" "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/gen/slashfilter" + lrand "github.com/filecoin-project/lotus/chain/rand" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/journal" - - logging "github.com/ipfs/go-log/v2" - "go.opencensus.io/trace" - "golang.org/x/xerrors" ) var log = logging.Logger("miner") diff --git a/node/builder.go b/node/builder.go index f0106ad97..4b0b5b745 100644 --- a/node/builder.go +++ b/node/builder.go @@ -5,14 +5,8 @@ import ( "errors" "time" - metricsi "github.com/ipfs/go-metrics-interface" - - "github.com/filecoin-project/lotus/node/impl/net" - - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/system" - logging "github.com/ipfs/go-log/v2" + metricsi "github.com/ipfs/go-metrics-interface" ci "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/network" @@ -27,6 +21,7 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/types" @@ -40,12 +35,14 @@ import ( "github.com/filecoin-project/lotus/markets/storageadapter" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/impl/common" + "github.com/filecoin-project/lotus/node/impl/net" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/helpers" "github.com/filecoin-project/lotus/node/modules/lp2p" "github.com/filecoin-project/lotus/node/modules/testing" "github.com/filecoin-project/lotus/node/repo" + "github.com/filecoin-project/lotus/system" ) //nolint:deadcode,varcheck diff --git a/node/bundle/bundle.go b/node/bundle/bundle.go index b08ff691c..2863cab54 100644 --- a/node/bundle/bundle.go +++ b/node/bundle/bundle.go @@ -6,15 +6,13 @@ import ( "io" "os" + cid "github.com/ipfs/go-cid" "github.com/ipld/go-car" - "golang.org/x/xerrors" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" - - cid "github.com/ipfs/go-cid" ) func LoadBundleFromFile(ctx context.Context, bs blockstore.Blockstore, path string) (cid.Cid, error) { diff --git a/node/config/def.go b/node/config/def.go index 6be3b61d8..c6d87788f 100644 --- a/node/config/def.go +++ b/node/config/def.go @@ -2,7 +2,6 @@ package config import ( "encoding" - "os" "strconv" "time" diff --git a/node/config/types.go b/node/config/types.go index 940d4893a..6d1939f94 100644 --- a/node/config/types.go +++ b/node/config/types.go @@ -1,9 +1,10 @@ package config import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/lotus/chain/types" sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" - "github.com/ipfs/go-cid" ) // // NOTE: ONLY PUT STRUCT DEFINITIONS IN THIS FILE diff --git a/node/fxlog.go b/node/fxlog.go index d5d1a3e1f..bafb3f27b 100644 --- a/node/fxlog.go +++ b/node/fxlog.go @@ -2,7 +2,6 @@ package node import ( logging "github.com/ipfs/go-log/v2" - "go.uber.org/fx" ) diff --git a/node/health.go b/node/health.go index 7291e7bc8..5c8bde26a 100644 --- a/node/health.go +++ b/node/health.go @@ -6,9 +6,10 @@ import ( "sync/atomic" "time" - lapi "github.com/filecoin-project/lotus/api" logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/network" + + lapi "github.com/filecoin-project/lotus/api" ) var healthlog = logging.Logger("healthcheck") diff --git a/node/hello/cbor_gen.go b/node/hello/cbor_gen.go index 68c82e2bb..81a1774c1 100644 --- a/node/hello/cbor_gen.go +++ b/node/hello/cbor_gen.go @@ -8,10 +8,11 @@ import ( "math" "sort" - abi "github.com/filecoin-project/go-state-types/abi" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + abi "github.com/filecoin-project/go-state-types/abi" ) var _ = xerrors.Errorf diff --git a/node/hello/hello.go b/node/hello/hello.go index ac92d5170..f59a5bc8d 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -4,17 +4,17 @@ import ( "context" "time" - "github.com/filecoin-project/go-state-types/abi" - "golang.org/x/xerrors" - - cborutil "github.com/filecoin-project/go-cbor-util" - "github.com/filecoin-project/go-state-types/big" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-core/host" inet "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" + "golang.org/x/xerrors" + + cborutil "github.com/filecoin-project/go-cbor-util" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain" diff --git a/node/impl/client/client.go b/node/impl/client/client.go index 83806ee80..a09bb8b2c 100644 --- a/node/impl/client/client.go +++ b/node/impl/client/client.go @@ -12,28 +12,21 @@ import ( "strings" "time" - market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" - + "github.com/ipfs/go-blockservice" + "github.com/ipfs/go-cid" bstore "github.com/ipfs/go-ipfs-blockstore" + offline "github.com/ipfs/go-ipfs-exchange-offline" + files "github.com/ipfs/go-ipfs-files" format "github.com/ipfs/go-ipld-format" + logging "github.com/ipfs/go-log/v2" + "github.com/ipfs/go-merkledag" unixfile "github.com/ipfs/go-unixfs/file" "github.com/ipld/go-car" "github.com/ipld/go-car/util" carv2 "github.com/ipld/go-car/v2" carv2bs "github.com/ipld/go-car/v2/blockstore" - "github.com/ipld/go-ipld-prime/datamodel" - "golang.org/x/xerrors" - - "github.com/filecoin-project/go-padreader" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/dline" - "github.com/ipfs/go-blockservice" - "github.com/ipfs/go-cid" - offline "github.com/ipfs/go-ipfs-exchange-offline" - files "github.com/ipfs/go-ipfs-files" - logging "github.com/ipfs/go-log/v2" - "github.com/ipfs/go-merkledag" "github.com/ipld/go-ipld-prime" + "github.com/ipld/go-ipld-prime/datamodel" cidlink "github.com/ipld/go-ipld-prime/linking/cid" basicnode "github.com/ipld/go-ipld-prime/node/basic" "github.com/ipld/go-ipld-prime/traversal" @@ -45,37 +38,38 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/multiformats/go-multibase" "go.uber.org/fx" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-commp-utils/writer" datatransfer "github.com/filecoin-project/go-data-transfer" - "github.com/filecoin-project/go-fil-markets/discovery" rm "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket/network" "github.com/filecoin-project/go-fil-markets/stores" - - "github.com/filecoin-project/lotus/lib/unixfs" - "github.com/filecoin-project/lotus/markets/retrievaladapter" - "github.com/filecoin-project/lotus/markets/storageadapter" - + "github.com/filecoin-project/go-padreader" "github.com/filecoin-project/go-state-types/abi" - - "github.com/filecoin-project/lotus/node/config" - "github.com/filecoin-project/lotus/node/repo/imports" + "github.com/filecoin-project/go-state-types/big" + market8 "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/unixfs" + "github.com/filecoin-project/lotus/markets/retrievaladapter" + "github.com/filecoin-project/lotus/markets/storageadapter" "github.com/filecoin-project/lotus/markets/utils" + "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/impl/full" "github.com/filecoin-project/lotus/node/impl/paych" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/repo" + "github.com/filecoin-project/lotus/node/repo/imports" ) var log = logging.Logger("client") diff --git a/node/impl/full.go b/node/impl/full.go index b66e647a1..0eb5eb109 100644 --- a/node/impl/full.go +++ b/node/impl/full.go @@ -4,9 +4,8 @@ import ( "context" "time" - "github.com/libp2p/go-libp2p-core/peer" - logging "github.com/ipfs/go-log/v2" + "github.com/libp2p/go-libp2p-core/peer" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" diff --git a/node/impl/full/chain.go b/node/impl/full/chain.go index 97bf260a4..011d451d6 100644 --- a/node/impl/full/chain.go +++ b/node/impl/full/chain.go @@ -10,11 +10,6 @@ import ( "strings" "sync" - "github.com/filecoin-project/lotus/chain/stmgr" - - "go.uber.org/fx" - "golang.org/x/xerrors" - blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" @@ -25,6 +20,8 @@ import ( "github.com/ipfs/go-merkledag" mh "github.com/multiformats/go-multihash" cbg "github.com/whyrusleeping/cbor-gen" + "go.uber.org/fx" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -32,6 +29,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" diff --git a/node/impl/full/gas.go b/node/impl/full/gas.go index 624296254..1e8a00922 100644 --- a/node/impl/full/gas.go +++ b/node/impl/full/gas.go @@ -6,21 +6,19 @@ import ( "math/rand" "sort" - lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" - - "github.com/filecoin-project/go-state-types/builtin" lru "github.com/hashicorp/golang-lru" - "go.uber.org/fx" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" + lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/messagepool" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" diff --git a/node/impl/full/mpool.go b/node/impl/full/mpool.go index afff871ca..2c9451079 100644 --- a/node/impl/full/mpool.go +++ b/node/impl/full/mpool.go @@ -4,11 +4,12 @@ import ( "context" "encoding/json" - "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" "go.uber.org/fx" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/messagepool" "github.com/filecoin-project/lotus/chain/messagesigner" diff --git a/node/impl/full/multisig.go b/node/impl/full/multisig.go index edc67ec9e..8438f7419 100644 --- a/node/impl/full/multisig.go +++ b/node/impl/full/multisig.go @@ -3,19 +3,18 @@ package full import ( "context" - "github.com/filecoin-project/go-state-types/big" + "go.uber.org/fx" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors/builtin/multisig" "github.com/filecoin-project/lotus/chain/types" - - multisig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig" - - "go.uber.org/fx" - "golang.org/x/xerrors" ) type MsigAPI struct { diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 69fe0fea2..e2dfe56a1 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -7,12 +7,8 @@ import ( "fmt" "strconv" - "github.com/libp2p/go-libp2p-core/peer" - - "github.com/filecoin-project/go-state-types/crypto" - - "github.com/filecoin-project/go-state-types/cbor" cid "github.com/ipfs/go-cid" + "github.com/libp2p/go-libp2p-core/peer" "go.uber.org/fx" "golang.org/x/xerrors" @@ -20,13 +16,14 @@ import ( "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "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/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" @@ -43,6 +40,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/node/modules/dtypes" ) diff --git a/node/impl/market/market.go b/node/impl/market/market.go index b62f2b40e..26ea9c14c 100644 --- a/node/impl/market/market.go +++ b/node/impl/market/market.go @@ -7,6 +7,7 @@ import ( "go.uber.org/fx" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/chain/actors" marketactor "github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/market" diff --git a/node/impl/net/conngater.go b/node/impl/net/conngater.go index 07e9784d9..f95b60b48 100644 --- a/node/impl/net/conngater.go +++ b/node/impl/net/conngater.go @@ -4,10 +4,9 @@ import ( "context" "net" - "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" manet "github.com/multiformats/go-multiaddr/net" + "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" ) diff --git a/node/impl/net/net.go b/node/impl/net/net.go index fe0cf8c58..260ba0f36 100644 --- a/node/impl/net/net.go +++ b/node/impl/net/net.go @@ -6,9 +6,6 @@ import ( "strings" "time" - "go.uber.org/fx" - "golang.org/x/xerrors" - "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/metrics" "github.com/libp2p/go-libp2p-core/network" @@ -19,6 +16,8 @@ import ( "github.com/libp2p/go-libp2p/p2p/net/conngater" "github.com/libp2p/go-libp2p/p2p/protocol/ping" ma "github.com/multiformats/go-multiaddr" + "go.uber.org/fx" + "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/node/modules/dtypes" diff --git a/node/impl/net/rcmgr.go b/node/impl/net/rcmgr.go index 1b6d57d8e..345e8de21 100644 --- a/node/impl/net/rcmgr.go +++ b/node/impl/net/rcmgr.go @@ -4,12 +4,11 @@ import ( "context" "strings" - "golang.org/x/xerrors" - "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" rcmgr "github.com/libp2p/go-libp2p-resource-manager" + "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" ) diff --git a/node/impl/paych/paych.go b/node/impl/paych/paych.go index 04ffbfe6a..b7d40c1e9 100644 --- a/node/impl/paych/paych.go +++ b/node/impl/paych/paych.go @@ -3,14 +3,13 @@ package paych import ( "context" - "golang.org/x/xerrors" - "github.com/ipfs/go-cid" "go.uber.org/fx" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/paychmgr" diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 1dc3c8e70..69249e1c6 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -11,15 +11,6 @@ import ( "strconv" "time" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - - "github.com/filecoin-project/dagstore" - "github.com/filecoin-project/dagstore/shard" - "github.com/filecoin-project/go-jsonrpc/auth" - - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/gen" - "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" @@ -30,8 +21,8 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/build" - + "github.com/filecoin-project/dagstore" + "github.com/filecoin-project/dagstore/shard" "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" gst "github.com/filecoin-project/go-data-transfer/transport/graphsync" @@ -39,22 +30,25 @@ import ( "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" filmktsstore "github.com/filecoin-project/go-fil-markets/stores" + "github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-state-types/abi" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/network" - mktsdagstore "github.com/filecoin-project/lotus/markets/dagstore" + sto "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/api" + apitypes "github.com/filecoin-project/lotus/api/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/types" sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/stores" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" - - sto "github.com/filecoin-project/specs-storage/storage" - - "github.com/filecoin-project/lotus/api" - apitypes "github.com/filecoin-project/lotus/api/types" - "github.com/filecoin-project/lotus/chain/types" + mktsdagstore "github.com/filecoin-project/lotus/markets/dagstore" "github.com/filecoin-project/lotus/markets/storageadapter" "github.com/filecoin-project/lotus/miner" "github.com/filecoin-project/lotus/node/modules/dtypes" diff --git a/node/modules/client.go b/node/modules/client.go index 1e7418204..f1262983d 100644 --- a/node/modules/client.go +++ b/node/modules/client.go @@ -7,6 +7,9 @@ import ( "path/filepath" "time" + "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore/namespace" + "github.com/libp2p/go-libp2p-core/host" "go.uber.org/fx" "golang.org/x/xerrors" @@ -14,11 +17,6 @@ import ( dtimpl "github.com/filecoin-project/go-data-transfer/impl" dtnet "github.com/filecoin-project/go-data-transfer/network" dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync" - "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/namespace" - "github.com/libp2p/go-libp2p-core/host" - "github.com/filecoin-project/go-fil-markets/discovery" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/retrievalmarket" @@ -28,14 +26,15 @@ import ( storageimpl "github.com/filecoin-project/go-fil-markets/storagemarket/impl" "github.com/filecoin-project/go-fil-markets/storagemarket/impl/requestvalidation" smnet "github.com/filecoin-project/go-fil-markets/storagemarket/network" - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/markets/storageadapter" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/chain/market" "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/markets" marketevents "github.com/filecoin-project/lotus/markets/loggers" "github.com/filecoin-project/lotus/markets/retrievaladapter" + "github.com/filecoin-project/lotus/markets/storageadapter" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/impl/full" payapi "github.com/filecoin-project/lotus/node/impl/paych" diff --git a/node/modules/dtypes/storage.go b/node/modules/dtypes/storage.go index 542445b1e..993ede55f 100644 --- a/node/modules/dtypes/storage.go +++ b/node/modules/dtypes/storage.go @@ -1,16 +1,16 @@ package dtypes import ( - datatransfer "github.com/filecoin-project/go-data-transfer" - "github.com/filecoin-project/go-statestore" bserv "github.com/ipfs/go-blockservice" "github.com/ipfs/go-datastore" "github.com/ipfs/go-graphsync" exchange "github.com/ipfs/go-ipfs-exchange-interface" + datatransfer "github.com/filecoin-project/go-data-transfer" dtnet "github.com/filecoin-project/go-data-transfer/network" "github.com/filecoin-project/go-fil-markets/piecestore" "github.com/filecoin-project/go-fil-markets/storagemarket/impl/requestvalidation" + "github.com/filecoin-project/go-statestore" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/node/repo/imports" diff --git a/node/modules/genesis.go b/node/modules/genesis.go index 03b4e2907..7f0a46afc 100644 --- a/node/modules/genesis.go +++ b/node/modules/genesis.go @@ -4,10 +4,9 @@ import ( "bytes" "os" - "go.uber.org/fx" - "github.com/ipfs/go-datastore" "github.com/ipld/go-car" + "go.uber.org/fx" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/chain/store" diff --git a/node/modules/ipfs.go b/node/modules/ipfs.go index 149608309..b39695e1a 100644 --- a/node/modules/ipfs.go +++ b/node/modules/ipfs.go @@ -2,13 +2,13 @@ package modules import ( bstore "github.com/ipfs/go-ipfs-blockstore" + "github.com/multiformats/go-multiaddr" "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/multiformats/go-multiaddr" - "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/markets/retrievaladapter" "github.com/filecoin-project/lotus/markets/storageadapter" diff --git a/node/modules/lp2p/libp2p.go b/node/modules/lp2p/libp2p.go index 5d8ece732..f06886157 100644 --- a/node/modules/lp2p/libp2p.go +++ b/node/modules/lp2p/libp2p.go @@ -4,10 +4,6 @@ import ( "crypto/rand" "time" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/types" - "golang.org/x/xerrors" - logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p" connmgr "github.com/libp2p/go-libp2p-connmgr" @@ -15,6 +11,10 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peerstore" "go.uber.org/fx" + "golang.org/x/xerrors" + + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) var log = logging.Logger("p2pnode") diff --git a/node/modules/lp2p/nat.go b/node/modules/lp2p/nat.go index f6c541ef7..7cb8dd9c1 100644 --- a/node/modules/lp2p/nat.go +++ b/node/modules/lp2p/nat.go @@ -10,9 +10,7 @@ import ( host "github.com/libp2p/go-libp2p-core/host" libp2pquic "github.com/libp2p/go-libp2p-quic-transport" "go.uber.org/fx" - "github.com/ipfs/go-ipfs/repo" - "github.com/filecoin-project/lotus/node/modules/helpers" ) diff --git a/node/modules/lp2p/rcmgr.go b/node/modules/lp2p/rcmgr.go index b82169393..5caec3464 100644 --- a/node/modules/lp2p/rcmgr.go +++ b/node/modules/lp2p/rcmgr.go @@ -8,21 +8,18 @@ import ( "os" "path/filepath" - "go.uber.org/fx" - + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" rcmgr "github.com/libp2p/go-libp2p-resource-manager" - - logging "github.com/ipfs/go-log/v2" + "go.opencensus.io/stats" + "go.opencensus.io/tag" + "go.uber.org/fx" "github.com/filecoin-project/lotus/metrics" "github.com/filecoin-project/lotus/node/repo" - - "go.opencensus.io/stats" - "go.opencensus.io/tag" ) func ResourceManager(connMgrHi uint) func(lc fx.Lifecycle, repo repo.LockedRepo) (network.ResourceManager, error) { diff --git a/node/modules/mpoolnonceapi.go b/node/modules/mpoolnonceapi.go index 67f512960..00e704727 100644 --- a/node/modules/mpoolnonceapi.go +++ b/node/modules/mpoolnonceapi.go @@ -7,12 +7,11 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/node/impl/full" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/lotus/chain/messagesigner" "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/node/impl/full" ) // MpoolNonceAPI substitutes the mpool nonce with an implementation that diff --git a/node/modules/paych.go b/node/modules/paych.go index 905590057..4f93bbd6c 100644 --- a/node/modules/paych.go +++ b/node/modules/paych.go @@ -3,14 +3,15 @@ package modules import ( "context" + "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore/namespace" + "go.uber.org/fx" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/node/impl/full" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/helpers" "github.com/filecoin-project/lotus/paychmgr" - "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/namespace" - "go.uber.org/fx" ) func NewManager(mctx helpers.MetricsCtx, lc fx.Lifecycle, sm stmgr.StateManagerAPI, pchstore *paychmgr.Store, api paychmgr.PaychAPI) *paychmgr.Manager { diff --git a/node/modules/services.go b/node/modules/services.go index fba6dc2fd..2a0303fa8 100644 --- a/node/modules/services.go +++ b/node/modules/services.go @@ -6,7 +6,6 @@ import ( "strconv" "time" - "github.com/filecoin-project/lotus/chain/consensus" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" eventbus "github.com/libp2p/go-eventbus" @@ -24,6 +23,7 @@ import ( "github.com/filecoin-project/lotus/chain" "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/beacon/drand" + "github.com/filecoin-project/lotus/chain/consensus" "github.com/filecoin-project/lotus/chain/exchange" "github.com/filecoin-project/lotus/chain/messagepool" "github.com/filecoin-project/lotus/chain/stmgr" diff --git a/node/modules/stmgr.go b/node/modules/stmgr.go index daef52b42..dd3d90f10 100644 --- a/node/modules/stmgr.go +++ b/node/modules/stmgr.go @@ -1,12 +1,12 @@ package modules import ( - "github.com/filecoin-project/lotus/chain/beacon" - "github.com/filecoin-project/lotus/chain/vm" "go.uber.org/fx" + "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/vm" ) func StateManager(lc fx.Lifecycle, cs *store.ChainStore, exec stmgr.Executor, sys vm.SyscallBuilder, us stmgr.UpgradeSchedule, b beacon.Schedule) (*stmgr.StateManager, error) { diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index 09b8b6f31..72ae4dfbf 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -12,18 +12,17 @@ import ( "time" "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-paramfetch" - "github.com/filecoin-project/go-statestore" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-storedcounter" "github.com/ipfs/go-datastore" - + "github.com/ipfs/go-datastore/namespace" + graphsync "github.com/ipfs/go-graphsync/impl" + gsnet "github.com/ipfs/go-graphsync/network" + "github.com/ipfs/go-graphsync/storeutil" + "github.com/libp2p/go-libp2p-core/host" "go.uber.org/fx" "go.uber.org/multierr" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" dtimpl "github.com/filecoin-project/go-data-transfer/impl" dtnet "github.com/filecoin-project/go-data-transfer/network" dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync" @@ -38,20 +37,12 @@ import ( "github.com/filecoin-project/go-fil-markets/storagemarket/impl/storedask" smnet "github.com/filecoin-project/go-fil-markets/storagemarket/network" "github.com/filecoin-project/go-jsonrpc/auth" + "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-statestore" + "github.com/filecoin-project/go-storedcounter" provider "github.com/filecoin-project/index-provider" - "github.com/ipfs/go-datastore/namespace" - graphsync "github.com/ipfs/go-graphsync/impl" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/storeutil" - "github.com/libp2p/go-libp2p-core/host" - - sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - "github.com/filecoin-project/lotus/extern/sector-storage/stores" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" @@ -62,6 +53,11 @@ import ( "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/gen/slashfilter" "github.com/filecoin-project/lotus/chain/types" + sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" + "github.com/filecoin-project/lotus/extern/sector-storage/stores" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" + "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/markets" "github.com/filecoin-project/lotus/markets/dagstore" diff --git a/node/modules/storageminer_dagstore.go b/node/modules/storageminer_dagstore.go index 84f7b33b6..987da5a7e 100644 --- a/node/modules/storageminer_dagstore.go +++ b/node/modules/storageminer_dagstore.go @@ -8,11 +8,11 @@ import ( "strconv" "github.com/libp2p/go-libp2p-core/host" - "go.uber.org/fx" "golang.org/x/xerrors" "github.com/filecoin-project/dagstore" + mdagstore "github.com/filecoin-project/lotus/markets/dagstore" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules/dtypes" diff --git a/node/modules/storageminer_idxprov.go b/node/modules/storageminer_idxprov.go index 1102f8295..0937786a1 100644 --- a/node/modules/storageminer_idxprov.go +++ b/node/modules/storageminer_idxprov.go @@ -3,9 +3,6 @@ package modules import ( "context" - "github.com/filecoin-project/go-address" - provider "github.com/filecoin-project/index-provider" - "github.com/filecoin-project/index-provider/engine" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" "github.com/libp2p/go-libp2p-core/host" @@ -13,6 +10,10 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + provider "github.com/filecoin-project/index-provider" + "github.com/filecoin-project/index-provider/engine" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules/dtypes" diff --git a/node/modules/storageminer_idxprov_test.go b/node/modules/storageminer_idxprov_test.go index c9189349b..6e66e3aa0 100644 --- a/node/modules/storageminer_idxprov_test.go +++ b/node/modules/storageminer_idxprov_test.go @@ -6,8 +6,6 @@ import ( "testing" "time" - "github.com/filecoin-project/go-address" - provider "github.com/filecoin-project/index-provider" "github.com/ipfs/go-datastore" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/host" @@ -15,6 +13,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/fx" + "github.com/filecoin-project/go-address" + provider "github.com/filecoin-project/index-provider" + "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/modules/dtypes" diff --git a/node/modules/storageminer_svc.go b/node/modules/storageminer_svc.go index 0a4be2192..dec045309 100644 --- a/node/modules/storageminer_svc.go +++ b/node/modules/storageminer_svc.go @@ -3,8 +3,6 @@ package modules import ( "context" - "github.com/filecoin-project/lotus/storage/sectorblocks" - "go.uber.org/fx" "golang.org/x/xerrors" @@ -12,6 +10,7 @@ import ( "github.com/filecoin-project/lotus/api/client" cliutil "github.com/filecoin-project/lotus/cli/util" "github.com/filecoin-project/lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) type MinerSealingService api.StorageMiner diff --git a/node/repo/fsrepo.go b/node/repo/fsrepo.go index 25c3e269e..1f90a1fea 100644 --- a/node/repo/fsrepo.go +++ b/node/repo/fsrepo.go @@ -13,7 +13,6 @@ import ( "sync" "github.com/BurntSushi/toml" - "github.com/ipfs/go-datastore" fslock "github.com/ipfs/go-fs-lock" logging "github.com/ipfs/go-log/v2" @@ -24,10 +23,9 @@ import ( "github.com/filecoin-project/lotus/blockstore" badgerbs "github.com/filecoin-project/lotus/blockstore/badger" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/stores" - - "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" ) diff --git a/node/repo/fsrepo_ds.go b/node/repo/fsrepo_ds.go index 09fb85460..a4415692a 100644 --- a/node/repo/fsrepo_ds.go +++ b/node/repo/fsrepo_ds.go @@ -6,13 +6,12 @@ import ( "path/filepath" dgbadger "github.com/dgraph-io/badger/v2" - ldbopts "github.com/syndtr/goleveldb/leveldb/opt" - "golang.org/x/xerrors" - "github.com/ipfs/go-datastore" badger "github.com/ipfs/go-ds-badger2" levelds "github.com/ipfs/go-ds-leveldb" measure "github.com/ipfs/go-ds-measure" + ldbopts "github.com/syndtr/goleveldb/leveldb/opt" + "golang.org/x/xerrors" ) type dsCtor func(path string, readonly bool) (datastore.Batching, error) diff --git a/node/repo/imports/manager.go b/node/repo/imports/manager.go index 2deaa30af..a3648b6b0 100644 --- a/node/repo/imports/manager.go +++ b/node/repo/imports/manager.go @@ -9,13 +9,12 @@ import ( "strconv" "github.com/ipfs/go-cid" + "github.com/ipfs/go-datastore" + "github.com/ipfs/go-datastore/namespace" "github.com/ipfs/go-datastore/query" logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" - "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/namespace" - "github.com/filecoin-project/go-fil-markets/shared" ) diff --git a/node/repo/interface.go b/node/repo/interface.go index 904511634..88c2f5666 100644 --- a/node/repo/interface.go +++ b/node/repo/interface.go @@ -8,10 +8,9 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/stores" - - "github.com/filecoin-project/lotus/chain/types" ) // BlockstoreDomain represents the domain of a blockstore. diff --git a/node/repo/repo_test.go b/node/repo/repo_test.go index cd19f86f6..f2b83ce8e 100644 --- a/node/repo/repo_test.go +++ b/node/repo/repo_test.go @@ -6,12 +6,11 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/node/config" - - "github.com/stretchr/testify/require" ) func basicTest(t *testing.T, repo Repo) { diff --git a/paychmgr/cbor_gen.go b/paychmgr/cbor_gen.go index 450d526d8..78a55488e 100644 --- a/paychmgr/cbor_gen.go +++ b/paychmgr/cbor_gen.go @@ -8,11 +8,12 @@ import ( "math" "sort" - address "github.com/filecoin-project/go-address" - paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" + + address "github.com/filecoin-project/go-address" + paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" ) var _ = xerrors.Errorf diff --git a/paychmgr/manager.go b/paychmgr/manager.go index f91cd793a..38cb8b8e6 100644 --- a/paychmgr/manager.go +++ b/paychmgr/manager.go @@ -5,8 +5,6 @@ import ( "errors" "sync" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" @@ -14,6 +12,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" diff --git a/paychmgr/msglistener.go b/paychmgr/msglistener.go index d1204e486..1b52667c7 100644 --- a/paychmgr/msglistener.go +++ b/paychmgr/msglistener.go @@ -1,11 +1,9 @@ package paychmgr import ( - "golang.org/x/xerrors" - "github.com/hannahhoward/go-pubsub" - "github.com/ipfs/go-cid" + "golang.org/x/xerrors" ) type msgListeners struct { diff --git a/paychmgr/paych.go b/paychmgr/paych.go index e0ea00d62..45703a6c8 100644 --- a/paychmgr/paych.go +++ b/paychmgr/paych.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lpaych "github.com/filecoin-project/lotus/chain/actors/builtin/paych" - "github.com/ipfs/go-cid" "golang.org/x/xerrors" @@ -16,6 +14,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/actors" + lpaych "github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/lib/sigs" ) diff --git a/paychmgr/paych_test.go b/paychmgr/paych_test.go index cec74d10b..6787e3e0d 100644 --- a/paychmgr/paych_test.go +++ b/paychmgr/paych_test.go @@ -6,8 +6,6 @@ import ( "context" "testing" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" @@ -16,6 +14,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "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/crypto" "github.com/filecoin-project/specs-actors/v2/actors/builtin" tutils "github.com/filecoin-project/specs-actors/v2/support/testing" diff --git a/paychmgr/paychget_test.go b/paychmgr/paychget_test.go index e18639794..cdb370650 100644 --- a/paychmgr/paychget_test.go +++ b/paychmgr/paychget_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - cborrpc "github.com/filecoin-project/go-cbor-util" "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" + cborrpc "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/specs-actors/v2/actors/builtin" diff --git a/paychmgr/paychvoucherfunds_test.go b/paychmgr/paychvoucherfunds_test.go index f44f75e4c..9cff7fc9d 100644 --- a/paychmgr/paychvoucherfunds_test.go +++ b/paychmgr/paychvoucherfunds_test.go @@ -4,15 +4,14 @@ import ( "context" "testing" - paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" - - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" tutils2 "github.com/filecoin-project/specs-actors/v2/support/testing" diff --git a/paychmgr/settle_test.go b/paychmgr/settle_test.go index 5512cd342..e51c2de47 100644 --- a/paychmgr/settle_test.go +++ b/paychmgr/settle_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-state-types/big" - tutils "github.com/filecoin-project/specs-actors/support/testing" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/go-state-types/big" + tutils "github.com/filecoin-project/specs-actors/support/testing" ) func TestPaychSettle(t *testing.T) { diff --git a/paychmgr/settler/settler.go b/paychmgr/settler/settler.go index 0984b207f..55431f0a5 100644 --- a/paychmgr/settler/settler.go +++ b/paychmgr/settler/settler.go @@ -4,12 +4,9 @@ import ( "context" "sync" - "github.com/filecoin-project/lotus/paychmgr" - - "go.uber.org/fx" - "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" + "go.uber.org/fx" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -23,6 +20,7 @@ import ( "github.com/filecoin-project/lotus/node/impl/full" payapi "github.com/filecoin-project/lotus/node/impl/paych" "github.com/filecoin-project/lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/paychmgr" ) var log = logging.Logger("payment-channel-settler") diff --git a/paychmgr/simple.go b/paychmgr/simple.go index 8e8363ffc..6b2aee2aa 100644 --- a/paychmgr/simple.go +++ b/paychmgr/simple.go @@ -14,7 +14,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" - init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" "github.com/filecoin-project/lotus/api" diff --git a/paychmgr/store.go b/paychmgr/store.go index 671537afe..72a95d0d4 100644 --- a/paychmgr/store.go +++ b/paychmgr/store.go @@ -7,19 +7,17 @@ import ( "fmt" "github.com/google/uuid" - "golang.org/x/xerrors" - - "github.com/filecoin-project/lotus/chain/types" - - cborutil "github.com/filecoin-project/go-cbor-util" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" dsq "github.com/ipfs/go-datastore/query" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" cborrpc "github.com/filecoin-project/go-cbor-util" - + cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/builtin/v8/paych" + + "github.com/filecoin-project/lotus/chain/types" ) var ErrChannelNotTracked = errors.New("channel not tracked") diff --git a/paychmgr/store_test.go b/paychmgr/store_test.go index 0c071b1e5..c5a1875ae 100644 --- a/paychmgr/store_test.go +++ b/paychmgr/store_test.go @@ -5,12 +5,12 @@ import ( "context" "testing" - "github.com/filecoin-project/go-address" - - tutils "github.com/filecoin-project/specs-actors/support/testing" ds "github.com/ipfs/go-datastore" ds_sync "github.com/ipfs/go-datastore/sync" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/go-address" + tutils "github.com/filecoin-project/specs-actors/support/testing" ) func TestStore(t *testing.T) { diff --git a/paychmgr/util.go b/paychmgr/util.go index 2e9965ff2..57853ac14 100644 --- a/paychmgr/util.go +++ b/paychmgr/util.go @@ -4,7 +4,6 @@ import ( "context" "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/builtin/v8/paych" ) diff --git a/storage/adapter_storage_miner.go b/storage/adapter_storage_miner.go index 4acf86f95..d270b7b20 100644 --- a/storage/adapter_storage_miner.go +++ b/storage/adapter_storage_miner.go @@ -12,14 +12,13 @@ import ( "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" - market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market" market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" diff --git a/storage/miner.go b/storage/miner.go index 80f06581f..8c15f544d 100644 --- a/storage/miner.go +++ b/storage/miner.go @@ -5,7 +5,6 @@ import ( "errors" "time" - "github.com/filecoin-project/go-bitfield" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" @@ -13,26 +12,24 @@ import ( "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/specs-storage/storage" - sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" - "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" - - "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v1api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - "github.com/filecoin-project/lotus/chain/events" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/types" + sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage" + "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" sealing "github.com/filecoin-project/lotus/extern/storage-sealing" "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/node/config" diff --git a/storage/mockstorage/preseal.go b/storage/mockstorage/preseal.go index 4e5b2306c..07e8646f5 100644 --- a/storage/mockstorage/preseal.go +++ b/storage/mockstorage/preseal.go @@ -3,18 +3,18 @@ package mockstorage import ( "fmt" - markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" + "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-commp-utils/zerocomm" commcid "github.com/filecoin-project/go-fil-commcid" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/extern/sector-storage/mock" - "golang.org/x/xerrors" + markettypes "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/extern/sector-storage/mock" "github.com/filecoin-project/lotus/genesis" ) diff --git a/storage/wdpost_changehandler.go b/storage/wdpost_changehandler.go index ce39eb37d..e4f0e3c5c 100644 --- a/storage/wdpost_changehandler.go +++ b/storage/wdpost_changehandler.go @@ -4,11 +4,11 @@ import ( "context" "sync" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/dline" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/storage/wdpost_changehandler_test.go b/storage/wdpost_changehandler_test.go index a1f08c200..97a297b16 100644 --- a/storage/wdpost_changehandler_test.go +++ b/storage/wdpost_changehandler_test.go @@ -8,18 +8,16 @@ import ( "testing" "time" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - - tutils "github.com/filecoin-project/specs-actors/support/testing" - - "github.com/filecoin-project/go-state-types/crypto" - "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" + "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" + tutils "github.com/filecoin-project/specs-actors/support/testing" + "github.com/filecoin-project/lotus/chain/types" ) diff --git a/storage/wdpost_journal.go b/storage/wdpost_journal.go index 53519588f..aefad9376 100644 --- a/storage/wdpost_journal.go +++ b/storage/wdpost_journal.go @@ -1,10 +1,11 @@ package storage import ( + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/dline" - "github.com/ipfs/go-cid" ) // SchedulerState defines the possible states in which the scheduler could be, diff --git a/storage/wdpost_nextdl_test.go b/storage/wdpost_nextdl_test.go index 5de546a17..41e07b64f 100644 --- a/storage/wdpost_nextdl_test.go +++ b/storage/wdpost_nextdl_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/go-state-types/abi" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" ) diff --git a/storage/wdpost_run.go b/storage/wdpost_run.go index 66dba486f..fe1a39126 100644 --- a/storage/wdpost_run.go +++ b/storage/wdpost_run.go @@ -5,26 +5,23 @@ import ( "context" "time" - "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/go-bitfield" - "github.com/filecoin-project/specs-storage/storage" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/go-state-types/dline" - "github.com/filecoin-project/go-state-types/network" "github.com/ipfs/go-cid" - "go.opencensus.io/trace" "golang.org/x/xerrors" - proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" - + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-bitfield" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/big" "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/crypto" + "github.com/filecoin-project/go-state-types/dline" + "github.com/filecoin-project/go-state-types/network" + "github.com/filecoin-project/go-state-types/proof" + proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-storage/storage" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" diff --git a/storage/wdpost_run_test.go b/storage/wdpost_run_test.go index 6efb3e547..a1a1ab261 100644 --- a/storage/wdpost_run_test.go +++ b/storage/wdpost_run_test.go @@ -6,33 +6,28 @@ import ( "context" "testing" - prooftypes "github.com/filecoin-project/go-state-types/proof" - - "github.com/filecoin-project/lotus/chain/actors" - lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/filecoin-project/lotus/chain/actors/builtin/miner" - + "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" - "github.com/filecoin-project/specs-storage/storage" - - "github.com/filecoin-project/go-state-types/builtin" - minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" - tutils "github.com/filecoin-project/specs-actors/v2/support/testing" - "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/network" + prooftypes "github.com/filecoin-project/go-state-types/proof" + tutils "github.com/filecoin-project/specs-actors/v2/support/testing" + "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin" + "github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/storiface" diff --git a/storage/wdpost_sched.go b/storage/wdpost_sched.go index 53801e362..cd10c59ef 100644 --- a/storage/wdpost_sched.go +++ b/storage/wdpost_sched.go @@ -4,6 +4,7 @@ import ( "context" "time" + "go.opencensus.io/trace" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" @@ -19,8 +20,6 @@ import ( "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" "github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/node/config" - - "go.opencensus.io/trace" ) // WindowPoStScheduler is the coordinator for WindowPoSt submissions, fault diff --git a/testplans/lotus-soup/deals_e2e.go b/testplans/lotus-soup/deals_e2e.go index 44eec2d7a..c4c855cd2 100644 --- a/testplans/lotus-soup/deals_e2e.go +++ b/testplans/lotus-soup/deals_e2e.go @@ -15,6 +15,7 @@ import ( "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" diff --git a/testplans/lotus-soup/deals_stress.go b/testplans/lotus-soup/deals_stress.go index 68347ce33..39eea8d0d 100644 --- a/testplans/lotus-soup/deals_stress.go +++ b/testplans/lotus-soup/deals_stress.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/filecoin-project/lotus/api" "github.com/ipfs/go-cid" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" ) diff --git a/testplans/lotus-soup/init.go b/testplans/lotus-soup/init.go index c20f5f2b8..bd9367a61 100644 --- a/testplans/lotus-soup/init.go +++ b/testplans/lotus-soup/init.go @@ -3,12 +3,12 @@ package main import ( "os" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/lotus/chain/actors/policy" + "github.com/ipfs/go-log/v2" "github.com/filecoin-project/go-state-types/abi" - "github.com/ipfs/go-log/v2" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/policy" ) func init() { diff --git a/testplans/lotus-soup/main.go b/testplans/lotus-soup/main.go index ec8b17aef..b1d17f018 100644 --- a/testplans/lotus-soup/main.go +++ b/testplans/lotus-soup/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/testground/sdk-go/run" + "github.com/filecoin-project/lotus/testplans/lotus-soup/paych" "github.com/filecoin-project/lotus/testplans/lotus-soup/rfwp" "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" - - "github.com/testground/sdk-go/run" ) var cases = map[string]interface{}{ diff --git a/testplans/lotus-soup/paych/stress.go b/testplans/lotus-soup/paych/stress.go index 6b91d7277..06c89d4d1 100644 --- a/testplans/lotus-soup/paych/stress.go +++ b/testplans/lotus-soup/paych/stress.go @@ -6,17 +6,15 @@ import ( "os" "time" - "github.com/filecoin-project/go-state-types/builtin/v8/paych" - "github.com/ipfs/go-cid" - - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/build" + "github.com/testground/sdk-go/sync" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" - "github.com/testground/sdk-go/sync" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" ) diff --git a/testplans/lotus-soup/rfwp/chain_state.go b/testplans/lotus-soup/rfwp/chain_state.go index 38b8b504e..929870e26 100644 --- a/testplans/lotus-soup/rfwp/chain_state.go +++ b/testplans/lotus-soup/rfwp/chain_state.go @@ -15,22 +15,19 @@ import ( "time" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/lotus/blockstore" - "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" - "github.com/filecoin-project/lotus/chain/store" - "github.com/filecoin-project/lotus/chain/types" - - "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" - - "github.com/filecoin-project/go-state-types/abi" - sealing "github.com/filecoin-project/lotus/extern/storage-sealing" - + "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/miner" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + sealing "github.com/filecoin-project/lotus/extern/storage-sealing" + "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" tsync "github.com/filecoin-project/lotus/tools/stats/sync" ) diff --git a/testplans/lotus-soup/rfwp/diffs.go b/testplans/lotus-soup/rfwp/diffs.go index 0f6e34725..fed1148e8 100644 --- a/testplans/lotus-soup/rfwp/diffs.go +++ b/testplans/lotus-soup/rfwp/diffs.go @@ -9,6 +9,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" ) diff --git a/testplans/lotus-soup/rfwp/e2e.go b/testplans/lotus-soup/rfwp/e2e.go index c4c37b111..29832c4f8 100644 --- a/testplans/lotus-soup/rfwp/e2e.go +++ b/testplans/lotus-soup/rfwp/e2e.go @@ -11,11 +11,13 @@ import ( "strings" "time" + "golang.org/x/sync/errgroup" + "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" - "golang.org/x/sync/errgroup" ) func RecoveryFromFailedWindowedPoStE2E(t *testkit.TestEnvironment) error { diff --git a/testplans/lotus-soup/rfwp/html_chain_state.go b/testplans/lotus-soup/rfwp/html_chain_state.go index 3c840facd..9dbd271a3 100644 --- a/testplans/lotus-soup/rfwp/html_chain_state.go +++ b/testplans/lotus-soup/rfwp/html_chain_state.go @@ -5,14 +5,15 @@ import ( "fmt" "os" - "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" + "github.com/ipfs/go-cid" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/testplans/lotus-soup/testkit" tsync "github.com/filecoin-project/lotus/tools/stats/sync" - "github.com/ipfs/go-cid" ) func FetchChainState(t *testkit.TestEnvironment, m *testkit.LotusMiner) error { diff --git a/testplans/lotus-soup/testkit/deals.go b/testplans/lotus-soup/testkit/deals.go index 703e6888a..b65517c4d 100644 --- a/testplans/lotus-soup/testkit/deals.go +++ b/testplans/lotus-soup/testkit/deals.go @@ -4,14 +4,15 @@ import ( "context" "fmt" + "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/chain/types" - "github.com/ipfs/go-cid" - tsync "github.com/filecoin-project/lotus/tools/stats/sync" ) diff --git a/testplans/lotus-soup/testkit/lotus_opts.go b/testplans/lotus-soup/testkit/lotus_opts.go index 46df9078d..a1b23f59e 100644 --- a/testplans/lotus-soup/testkit/lotus_opts.go +++ b/testplans/lotus-soup/testkit/lotus_opts.go @@ -3,15 +3,15 @@ package testkit import ( "fmt" + "github.com/libp2p/go-libp2p-core/peer" + ma "github.com/multiformats/go-multiaddr" + "github.com/filecoin-project/lotus/node" "github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/lp2p" "github.com/filecoin-project/lotus/node/repo" - - "github.com/libp2p/go-libp2p-core/peer" - ma "github.com/multiformats/go-multiaddr" ) func withGenesis(gb []byte) node.Option { diff --git a/testplans/lotus-soup/testkit/node.go b/testplans/lotus-soup/testkit/node.go index 9506c4bf4..cd9e0bb78 100644 --- a/testplans/lotus-soup/testkit/node.go +++ b/testplans/lotus-soup/testkit/node.go @@ -8,7 +8,14 @@ import ( "sort" "time" + influxdb "github.com/kpacha/opencensus-influxdb" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr/net" + "go.opencensus.io/stats" + "go.opencensus.io/stats/view" + "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/beacon" "github.com/filecoin-project/lotus/chain/wallet" @@ -17,17 +24,10 @@ import ( "github.com/filecoin-project/lotus/node" "github.com/filecoin-project/lotus/node/modules/dtypes" modtest "github.com/filecoin-project/lotus/node/modules/testing" - tinflux "github.com/filecoin-project/lotus/tools/stats/influx" tipldstore "github.com/filecoin-project/lotus/tools/stats/ipldstore" tpoints "github.com/filecoin-project/lotus/tools/stats/points" tsync "github.com/filecoin-project/lotus/tools/stats/sync" - - influxdb "github.com/kpacha/opencensus-influxdb" - ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr/net" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" ) var PrepareNodeTimeout = 3 * time.Minute diff --git a/testplans/lotus-soup/testkit/retrieval.go b/testplans/lotus-soup/testkit/retrieval.go index 67e8d1654..0182b0907 100644 --- a/testplans/lotus-soup/testkit/retrieval.go +++ b/testplans/lotus-soup/testkit/retrieval.go @@ -10,8 +10,6 @@ import ( "path/filepath" "time" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/v0api" "github.com/ipfs/go-cid" files "github.com/ipfs/go-ipfs-files" ipld "github.com/ipfs/go-ipld-format" @@ -19,6 +17,9 @@ import ( dstest "github.com/ipfs/go-merkledag/test" unixfile "github.com/ipfs/go-unixfs/file" "github.com/ipld/go-car" + + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/v0api" ) func RetrieveData(t *TestEnvironment, ctx context.Context, client api.FullNode, fcid cid.Cid, _ *cid.Cid, carExport bool, data []byte) error { diff --git a/testplans/lotus-soup/testkit/role_bootstrapper.go b/testplans/lotus-soup/testkit/role_bootstrapper.go index 4a6ac56c9..2e2c7c82b 100644 --- a/testplans/lotus-soup/testkit/role_bootstrapper.go +++ b/testplans/lotus-soup/testkit/role_bootstrapper.go @@ -7,6 +7,12 @@ import ( mbig "math/big" "time" + "github.com/google/uuid" + "github.com/libp2p/go-libp2p-core/peer" + ma "github.com/multiformats/go-multiaddr" + + "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/gen" "github.com/filecoin-project/lotus/chain/types" @@ -15,12 +21,6 @@ import ( "github.com/filecoin-project/lotus/node/modules" modtest "github.com/filecoin-project/lotus/node/modules/testing" "github.com/filecoin-project/lotus/node/repo" - "github.com/google/uuid" - - "github.com/filecoin-project/go-state-types/big" - - "github.com/libp2p/go-libp2p-core/peer" - ma "github.com/multiformats/go-multiaddr" ) // Bootstrapper is a special kind of process that produces a genesis block with diff --git a/testplans/lotus-soup/testkit/role_client.go b/testplans/lotus-soup/testkit/role_client.go index d18a835d2..595284493 100644 --- a/testplans/lotus-soup/testkit/role_client.go +++ b/testplans/lotus-soup/testkit/role_client.go @@ -7,15 +7,17 @@ import ( "time" "contrib.go.opencensus.io/exporter/prometheus" + "github.com/gorilla/mux" + "github.com/hashicorp/go-multierror" + "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-jsonrpc/auth" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/node" "github.com/filecoin-project/lotus/node/repo" - "github.com/gorilla/mux" - "github.com/hashicorp/go-multierror" ) type LotusClient struct { diff --git a/testplans/lotus-soup/testkit/role_drand.go b/testplans/lotus-soup/testkit/role_drand.go index afe310dcd..7e565aa8a 100644 --- a/testplans/lotus-soup/testkit/role_drand.go +++ b/testplans/lotus-soup/testkit/role_drand.go @@ -21,11 +21,11 @@ import ( dnet "github.com/drand/drand/net" "github.com/drand/drand/protobuf/drand" dtest "github.com/drand/drand/test" - "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/libp2p/go-libp2p-core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/testground/sdk-go/sync" + "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/testplans/lotus-soup/statemachine" ) diff --git a/testplans/lotus-soup/testkit/role_miner.go b/testplans/lotus-soup/testkit/role_miner.go index 2c7e0ff65..a30af3671 100644 --- a/testplans/lotus-soup/testkit/role_miner.go +++ b/testplans/lotus-soup/testkit/role_miner.go @@ -11,11 +11,22 @@ import ( "time" "contrib.go.opencensus.io/exporter/prometheus" + "github.com/google/uuid" + "github.com/gorilla/mux" + "github.com/hashicorp/go-multierror" + "github.com/ipfs/go-datastore" + libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" + "github.com/libp2p/go-libp2p-core/peer" + "github.com/testground/sdk-go/sync" + "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-storedcounter" + "github.com/filecoin-project/specs-actors/actors/builtin" + saminer "github.com/filecoin-project/specs-actors/actors/builtin/miner" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" @@ -32,15 +43,6 @@ import ( "github.com/filecoin-project/lotus/node/impl" "github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/specs-actors/actors/builtin" - saminer "github.com/filecoin-project/specs-actors/actors/builtin/miner" - "github.com/google/uuid" - "github.com/gorilla/mux" - "github.com/hashicorp/go-multierror" - "github.com/ipfs/go-datastore" - libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/testground/sdk-go/sync" ) const ( diff --git a/testplans/lotus-soup/testkit/role_pubsub_tracer.go b/testplans/lotus-soup/testkit/role_pubsub_tracer.go index 401a9824d..e5da62f7e 100644 --- a/testplans/lotus-soup/testkit/role_pubsub_tracer.go +++ b/testplans/lotus-soup/testkit/role_pubsub_tracer.go @@ -9,7 +9,6 @@ import ( "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-pubsub-tracer/traced" - ma "github.com/multiformats/go-multiaddr" ) diff --git a/testplans/lotus-soup/testkit/sync.go b/testplans/lotus-soup/testkit/sync.go index a61e29612..35b38170f 100644 --- a/testplans/lotus-soup/testkit/sync.go +++ b/testplans/lotus-soup/testkit/sync.go @@ -1,11 +1,13 @@ package testkit import ( - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/lotus/genesis" - "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/libp2p/go-libp2p-core/peer" "github.com/testground/sdk-go/sync" + + "github.com/filecoin-project/go-address" + + "github.com/filecoin-project/lotus/genesis" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var ( diff --git a/tools/stats/headbuffer/head_buffer_test.go b/tools/stats/headbuffer/head_buffer_test.go index d39cbfdc5..d68ba8fbc 100644 --- a/tools/stats/headbuffer/head_buffer_test.go +++ b/tools/stats/headbuffer/head_buffer_test.go @@ -4,8 +4,9 @@ package headbuffer import ( "testing" - "github.com/filecoin-project/lotus/api" "github.com/stretchr/testify/require" + + "github.com/filecoin-project/lotus/api" ) func TestHeadBuffer(t *testing.T) { diff --git a/tools/stats/influx/influx.go b/tools/stats/influx/influx.go index 65fb4c0b9..39f25edbe 100644 --- a/tools/stats/influx/influx.go +++ b/tools/stats/influx/influx.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/filecoin-project/lotus/build" - _ "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" ) type PointList struct { diff --git a/tools/stats/ipldstore/ipldstore.go b/tools/stats/ipldstore/ipldstore.go index 9adc599fd..e172d2af2 100644 --- a/tools/stats/ipldstore/ipldstore.go +++ b/tools/stats/ipldstore/ipldstore.go @@ -5,12 +5,12 @@ import ( "context" "fmt" - "github.com/filecoin-project/lotus/tools/stats/metrics" - lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/stats" + + "github.com/filecoin-project/lotus/tools/stats/metrics" ) type ApiIpldStore struct { diff --git a/tools/stats/points/collect.go b/tools/stats/points/collect.go index a7c37fcd9..0fc621b00 100644 --- a/tools/stats/points/collect.go +++ b/tools/stats/points/collect.go @@ -8,7 +8,15 @@ import ( "strings" "time" + lru "github.com/hashicorp/golang-lru" + client "github.com/influxdata/influxdb1-client/v2" + "github.com/ipfs/go-cid" + "github.com/multiformats/go-multihash" + "go.opencensus.io/stats" + "golang.org/x/xerrors" + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors/adt" @@ -18,13 +26,6 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/tools/stats/influx" "github.com/filecoin-project/lotus/tools/stats/metrics" - - lru "github.com/hashicorp/golang-lru" - client "github.com/influxdata/influxdb1-client/v2" - "github.com/ipfs/go-cid" - "github.com/multiformats/go-multihash" - "go.opencensus.io/stats" - "golang.org/x/xerrors" ) type LotusApi interface {