diff --git a/api/api_common.go b/api/api_common.go index eb440bd012b..a0726528d88 100644 --- a/api/api_common.go +++ b/api/api_common.go @@ -3,6 +3,7 @@ package api import ( "context" "fmt" + "github.com/google/uuid" "github.com/filecoin-project/go-jsonrpc/auth" @@ -11,7 +12,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" protocol "github.com/libp2p/go-libp2p-core/protocol" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" ) type Common interface { diff --git a/api/apistruct/struct.go b/api/apistruct/struct.go index b6265bcba9b..56ead4b1072 100644 --- a/api/apistruct/struct.go +++ b/api/apistruct/struct.go @@ -33,7 +33,7 @@ import ( "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" "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/api/docgen/docgen.go b/api/docgen/docgen.go index 58adbc6c635..23caa3a8fe9 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -34,7 +34,7 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks" diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go index 8fd646d9abe..1e0ff151b77 100644 --- a/api/mocks/mock_full.go +++ b/api/mocks/mock_full.go @@ -6,6 +6,8 @@ package mocks import ( context "context" + reflect "reflect" + address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -32,7 +34,6 @@ import ( network0 "github.com/libp2p/go-libp2p-core/network" peer "github.com/libp2p/go-libp2p-core/peer" protocol "github.com/libp2p/go-libp2p-core/protocol" - reflect "reflect" ) // MockFullNode is a mock of FullNode interface diff --git a/build/openrpc.go b/build/openrpc.go index 486bce6dab4..0f514c8aac5 100644 --- a/build/openrpc.go +++ b/build/openrpc.go @@ -7,7 +7,7 @@ import ( rice "github.com/GeertJohan/go.rice" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" ) func mustReadGzippedOpenRPCDocument(data []byte) apitypes.OpenRPCDocument { diff --git a/build/openrpc_test.go b/build/openrpc_test.go index 8aca4f17d38..20c77533193 100644 --- a/build/openrpc_test.go +++ b/build/openrpc_test.go @@ -3,7 +3,7 @@ package build import ( "testing" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" ) func TestOpenRPCDiscoverJSON_Version(t *testing.T) { diff --git a/cli/servicesmock_test.go b/cli/servicesmock_test.go index 48f1a95ec19..fcedea7185d 100644 --- a/cli/servicesmock_test.go +++ b/cli/servicesmock_test.go @@ -6,11 +6,12 @@ package cli import ( context "context" + reflect "reflect" + go_address "github.com/filecoin-project/go-address" abi "github.com/filecoin-project/go-state-types/abi" gomock "github.com/golang/mock/gomock" go_cid "github.com/ipfs/go-cid" - reflect "reflect" ) // MockServicesAPI is a mock of ServicesAPI interface diff --git a/node/impl/common/common.go b/node/impl/common/common.go index 3c8181ea343..7d99fb42ac9 100644 --- a/node/impl/common/common.go +++ b/node/impl/common/common.go @@ -24,7 +24,7 @@ import ( "github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/lp2p" diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 390b6a67297..e81560059c9 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -32,7 +32,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api/apistruct" - "github.com/filecoin-project/lotus/api/types" + apitypes "github.com/filecoin-project/lotus/api/types" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/markets/storageadapter" "github.com/filecoin-project/lotus/miner"