diff --git a/api/api.go b/api/api.go index bde700e5c..c7406ee52 100644 --- a/api/api.go +++ b/api/api.go @@ -10,10 +10,10 @@ import ( "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" sectorbuilder "github.com/filecoin-project/go-sectorbuilder" ) diff --git a/api/client/client.go b/api/client/client.go index f6d662a91..ffca93363 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -3,8 +3,8 @@ package client import ( "net/http" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/lib/jsonrpc" ) // NewCommonRPC creates a new http jsonrpc client. diff --git a/api/struct.go b/api/struct.go index 3db672e46..632488e23 100644 --- a/api/struct.go +++ b/api/struct.go @@ -8,9 +8,9 @@ import ( "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" ) // All permissions are listed in permissioned.go diff --git a/api/test/test.go b/api/test/test.go index d60659a00..1e369fa8c 100644 --- a/api/test/test.go +++ b/api/test/test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" "github.com/stretchr/testify/assert" ) diff --git a/build/bootstrap.go b/build/bootstrap.go index 94892d39b..9f8dd6883 100644 --- a/build/bootstrap.go +++ b/build/bootstrap.go @@ -2,7 +2,7 @@ package build import ( "context" - "github.com/filecoin-project/go-lotus/lib/addrutil" + "github.com/filecoin-project/lotus/lib/addrutil" "os" "strings" diff --git a/chain/actors/actor_init.go b/chain/actors/actor_init.go index e95884d6d..eebec4c26 100644 --- a/chain/actors/actor_init.go +++ b/chain/actors/actor_init.go @@ -6,9 +6,9 @@ import ( "encoding/binary" "fmt" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" diff --git a/chain/actors/actor_miner.go b/chain/actors/actor_miner.go index be6398255..de7e4d225 100644 --- a/chain/actors/actor_miner.go +++ b/chain/actors/actor_miner.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" "github.com/filecoin-project/go-amt-ipld" "github.com/ipfs/go-cid" diff --git a/chain/actors/actor_multisig.go b/chain/actors/actor_multisig.go index f06da0e51..1ddb9d6a3 100644 --- a/chain/actors/actor_multisig.go +++ b/chain/actors/actor_multisig.go @@ -3,9 +3,9 @@ package actors import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" cbg "github.com/whyrusleeping/cbor-gen" ) diff --git a/chain/actors/actor_multisig_test.go b/chain/actors/actor_multisig_test.go index 3fe5a349b..b705ad4a8 100644 --- a/chain/actors/actor_multisig_test.go +++ b/chain/actors/actor_multisig_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" ) func TestMultiSigCreate(t *testing.T) { diff --git a/chain/actors/actor_paych.go b/chain/actors/actor_paych.go index 02f3e7386..30c8565f8 100644 --- a/chain/actors/actor_paych.go +++ b/chain/actors/actor_paych.go @@ -6,10 +6,10 @@ import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) type PaymentChannelActor struct{} diff --git a/chain/actors/actor_paych_test.go b/chain/actors/actor_paych_test.go index 7bdaa4e06..3b712598c 100644 --- a/chain/actors/actor_paych_test.go +++ b/chain/actors/actor_paych_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" ) func TestPaychCreate(t *testing.T) { diff --git a/chain/actors/actor_storagepower.go b/chain/actors/actor_storagepower.go index e44ca87a0..21afb6dd0 100644 --- a/chain/actors/actor_storagepower.go +++ b/chain/actors/actor_storagepower.go @@ -3,10 +3,10 @@ package actors import ( "context" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" cid "github.com/ipfs/go-cid" hamt "github.com/ipfs/go-hamt-ipld" diff --git a/chain/actors/actor_storagepower_test.go b/chain/actors/actor_storagepower_test.go index 85cfcbd4a..cc4ef921c 100644 --- a/chain/actors/actor_storagepower_test.go +++ b/chain/actors/actor_storagepower_test.go @@ -5,14 +5,14 @@ import ( "fmt" "testing" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" cbg "github.com/whyrusleeping/cbor-gen" - . "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" - "github.com/filecoin-project/go-lotus/chain/wallet" + . "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" + "github.com/filecoin-project/lotus/chain/wallet" cid "github.com/ipfs/go-cid" hamt "github.com/ipfs/go-hamt-ipld" diff --git a/chain/actors/actors.go b/chain/actors/actors.go index 1e965fa11..72d3b96d5 100644 --- a/chain/actors/actors.go +++ b/chain/actors/actors.go @@ -1,7 +1,7 @@ package actors import ( - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" diff --git a/chain/actors/actors_test.go b/chain/actors/actors_test.go index f39c5cd8c..36902de75 100644 --- a/chain/actors/actors_test.go +++ b/chain/actors/actors_test.go @@ -6,14 +6,14 @@ import ( "fmt" "testing" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" - . "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + . "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" dstore "github.com/ipfs/go-datastore" bstore "github.com/ipfs/go-ipfs-blockstore" ) diff --git a/chain/actors/address.go b/chain/actors/address.go index b80087a79..f88cf0f0a 100644 --- a/chain/actors/address.go +++ b/chain/actors/address.go @@ -1,8 +1,8 @@ package actors import ( - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" ) func NewIDAddress(id uint64) (address.Address, ActorError) { diff --git a/chain/actors/aerrors/error_test.go b/chain/actors/aerrors/error_test.go index 673a832d4..242874a06 100644 --- a/chain/actors/aerrors/error_test.go +++ b/chain/actors/aerrors/error_test.go @@ -3,7 +3,7 @@ package aerrors_test import ( "testing" - . "github.com/filecoin-project/go-lotus/chain/actors/aerrors" + . "github.com/filecoin-project/lotus/chain/actors/aerrors" "github.com/stretchr/testify/assert" "golang.org/x/xerrors" diff --git a/chain/actors/cbor_gen.go b/chain/actors/cbor_gen.go index 40a7b6f0e..d39a81af2 100644 --- a/chain/actors/cbor_gen.go +++ b/chain/actors/cbor_gen.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" diff --git a/chain/actors/error.go b/chain/actors/error.go index 164e3ad78..a24f952da 100644 --- a/chain/actors/error.go +++ b/chain/actors/error.go @@ -1,5 +1,5 @@ package actors -import "github.com/filecoin-project/go-lotus/chain/actors/aerrors" +import "github.com/filecoin-project/lotus/chain/actors/aerrors" type ActorError = aerrors.ActorError diff --git a/chain/actors/harness2_test.go b/chain/actors/harness2_test.go index 80bfa6e4f..f0fc4b3e7 100644 --- a/chain/actors/harness2_test.go +++ b/chain/actors/harness2_test.go @@ -13,14 +13,14 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" - "github.com/filecoin-project/go-lotus/chain/wallet" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "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/chain/wallet" ) const testGasLimit = 10000 diff --git a/chain/actors/params.go b/chain/actors/params.go index 94624502c..c713167ce 100644 --- a/chain/actors/params.go +++ b/chain/actors/params.go @@ -3,7 +3,7 @@ package actors import ( "bytes" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/actors/aerrors" cbg "github.com/whyrusleeping/cbor-gen" ) diff --git a/chain/address/address_test.go b/chain/address/address_test.go index ae555286d..1c666ee7c 100644 --- a/chain/address/address_test.go +++ b/chain/address/address_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-lotus/lib/crypto" + "github.com/filecoin-project/lotus/lib/crypto" ) func init() { diff --git a/chain/badtscache.go b/chain/badtscache.go index ee63c1abd..8048a76d2 100644 --- a/chain/badtscache.go +++ b/chain/badtscache.go @@ -1,7 +1,7 @@ package chain import ( - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" ) diff --git a/chain/blocksync.go b/chain/blocksync.go index 50d24196a..8a9e629eb 100644 --- a/chain/blocksync.go +++ b/chain/blocksync.go @@ -13,10 +13,10 @@ import ( "go.opencensus.io/trace" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/cborrpc" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/node/modules/dtypes" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" diff --git a/chain/cbor_gen.go b/chain/cbor_gen.go index e7f2a40b8..30e62071b 100644 --- a/chain/cbor_gen.go +++ b/chain/cbor_gen.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/filecoin-project/go-lotus/chain/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" diff --git a/chain/deals/asks.go b/chain/deals/asks.go index c4e40af9d..df82550e8 100644 --- a/chain/deals/asks.go +++ b/chain/deals/asks.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborrpc" datastore "github.com/ipfs/go-datastore" cbor "github.com/ipfs/go-ipld-cbor" inet "github.com/libp2p/go-libp2p-core/network" diff --git a/chain/deals/client.go b/chain/deals/client.go index 70fe26252..bf059ab93 100644 --- a/chain/deals/client.go +++ b/chain/deals/client.go @@ -14,15 +14,15 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" - "github.com/filecoin-project/go-lotus/lib/cborrpc" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/retrieval/discovery" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/retrieval/discovery" ) func init() { diff --git a/chain/deals/client_states.go b/chain/deals/client_states.go index b71f7a895..d19270707 100644 --- a/chain/deals/client_states.go +++ b/chain/deals/client_states.go @@ -2,12 +2,12 @@ package deals import ( "context" - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/lib/sectorbuilder" ) type clientHandlerFunc func(ctx context.Context, deal ClientDeal) error diff --git a/chain/deals/client_utils.go b/chain/deals/client_utils.go index 159bf20e9..c192bbeb4 100644 --- a/chain/deals/client_utils.go +++ b/chain/deals/client_utils.go @@ -2,7 +2,7 @@ package deals import ( "context" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/lib/sectorbuilder" "runtime" "github.com/ipfs/go-cid" @@ -12,8 +12,8 @@ import ( inet "github.com/libp2p/go-libp2p-core/network" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/lib/cborrpc" ) func (c *Client) failDeal(id cid.Cid, cerr error) { diff --git a/chain/deals/handler.go b/chain/deals/handler.go index 112f827f5..02db7153c 100644 --- a/chain/deals/handler.go +++ b/chain/deals/handler.go @@ -13,12 +13,12 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/storage/commitment" - "github.com/filecoin-project/go-lotus/storage/sectorblocks" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/storage/commitment" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) func init() { diff --git a/chain/deals/handler_states.go b/chain/deals/handler_states.go index 573b8d202..a981497e3 100644 --- a/chain/deals/handler_states.go +++ b/chain/deals/handler_states.go @@ -10,12 +10,12 @@ import ( unixfile "github.com/ipfs/go-unixfs/file" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/storage/sectorblocks" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) type minerHandlerFunc func(ctx context.Context, deal MinerDeal) (func(*MinerDeal), error) diff --git a/chain/deals/handler_utils.go b/chain/deals/handler_utils.go index a3a4742e9..099a07e7d 100644 --- a/chain/deals/handler_utils.go +++ b/chain/deals/handler_utils.go @@ -4,12 +4,12 @@ import ( "context" "runtime" - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborrpc" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" diff --git a/chain/deals/types.go b/chain/deals/types.go index ddc754b7e..58970700e 100644 --- a/chain/deals/types.go +++ b/chain/deals/types.go @@ -1,13 +1,13 @@ package deals import ( - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func init() { diff --git a/chain/deals/vouchers.go b/chain/deals/vouchers.go index a8b3f33c8..f854299b0 100644 --- a/chain/deals/vouchers.go +++ b/chain/deals/vouchers.go @@ -1,9 +1,9 @@ package deals import ( - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) func VoucherSpec(blocksDuration uint64, price types.BigInt, start uint64, extra *types.ModVerifyParams) []api.VoucherSpec { diff --git a/chain/events/events.go b/chain/events/events.go index b7366774e..b9decb22f 100644 --- a/chain/events/events.go +++ b/chain/events/events.go @@ -9,10 +9,10 @@ import ( logging "github.com/ipfs/go-log" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" ) var log = logging.Logger("events") diff --git a/chain/events/events_called.go b/chain/events/events_called.go index 5b94010cf..98ea04ec8 100644 --- a/chain/events/events_called.go +++ b/chain/events/events_called.go @@ -7,8 +7,8 @@ import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) const NoTimeout = math.MaxUint64 diff --git a/chain/events/events_height.go b/chain/events/events_height.go index b5bf297e5..0b064fe65 100644 --- a/chain/events/events_height.go +++ b/chain/events/events_height.go @@ -3,7 +3,7 @@ package events import ( "sync" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) type heightEvents struct { diff --git a/chain/events/events_test.go b/chain/events/events_test.go index 474d0dce0..e2d27ec7a 100644 --- a/chain/events/events_test.go +++ b/chain/events/events_test.go @@ -6,16 +6,16 @@ import ( "testing" "time" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/store" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/store" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) var dummyCid cid.Cid diff --git a/chain/events/tscache.go b/chain/events/tscache.go index 7279d4ab8..1bccb4d65 100644 --- a/chain/events/tscache.go +++ b/chain/events/tscache.go @@ -5,7 +5,7 @@ import ( "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) type tsByHFunc func(context.Context, uint64, *types.TipSet) (*types.TipSet, error) diff --git a/chain/events/tscache_test.go b/chain/events/tscache_test.go index 33953dc7b..d8fab8f12 100644 --- a/chain/events/tscache_test.go +++ b/chain/events/tscache_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func TestTsCache(t *testing.T) { diff --git a/chain/gen/gen.go b/chain/gen/gen.go index f294fb94d..ef1460430 100644 --- a/chain/gen/gen.go +++ b/chain/gen/gen.go @@ -13,14 +13,14 @@ import ( peer "github.com/libp2p/go-libp2p-peer" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "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/wallet" + "github.com/filecoin-project/lotus/node/repo" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" diff --git a/chain/gen/mining.go b/chain/gen/mining.go index cb8a926b0..0ede4460e 100644 --- a/chain/gen/mining.go +++ b/chain/gen/mining.go @@ -11,12 +11,12 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" - "github.com/filecoin-project/go-lotus/chain/wallet" + "github.com/filecoin-project/lotus/chain/address" + "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" + "github.com/filecoin-project/lotus/chain/wallet" ) func MinerCreateBlock(ctx context.Context, sm *stmgr.StateManager, w *wallet.Wallet, miner address.Address, parents *types.TipSet, tickets []*types.Ticket, proof types.ElectionProof, msgs []*types.SignedMessage, timestamp uint64) (*types.FullBlock, error) { diff --git a/chain/gen/utils.go b/chain/gen/utils.go index 3db68cd93..6a1a5ca34 100644 --- a/chain/gen/utils.go +++ b/chain/gen/utils.go @@ -5,13 +5,13 @@ import ( "fmt" amt "github.com/filecoin-project/go-amt-ipld" - "github.com/filecoin-project/go-lotus/build" - actors "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + "github.com/filecoin-project/lotus/build" + actors "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "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" "golang.org/x/xerrors" "github.com/ipfs/go-cid" diff --git a/chain/messagepool.go b/chain/messagepool.go index af6314cfd..5bb24f27f 100644 --- a/chain/messagepool.go +++ b/chain/messagepool.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" ) var ( diff --git a/chain/metrics/consensus.go b/chain/metrics/consensus.go index 0fae64667..8fba65b05 100644 --- a/chain/metrics/consensus.go +++ b/chain/metrics/consensus.go @@ -9,9 +9,9 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/impl/full" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/impl/full" + "github.com/filecoin-project/lotus/node/modules/helpers" ) var log = logging.Logger("metrics") diff --git a/chain/state/statetree.go b/chain/state/statetree.go index 736857b25..4f1cdb36d 100644 --- a/chain/state/statetree.go +++ b/chain/state/statetree.go @@ -9,9 +9,9 @@ import ( logging "github.com/ipfs/go-log" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "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 180add582..79629daeb 100644 --- a/chain/state/statetree_test.go +++ b/chain/state/statetree_test.go @@ -3,9 +3,9 @@ package state import ( "testing" - actors "github.com/filecoin-project/go-lotus/chain/actors" - address "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + actors "github.com/filecoin-project/lotus/chain/actors" + address "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" hamt "github.com/ipfs/go-hamt-ipld" ) diff --git a/chain/stmgr/call.go b/chain/stmgr/call.go index 10e5b9b0e..fffc923c2 100644 --- a/chain/stmgr/call.go +++ b/chain/stmgr/call.go @@ -7,10 +7,10 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/vm" ) func (sm *StateManager) CallRaw(ctx context.Context, msg *types.Message, bstate cid.Cid, r vm.Rand, bheight uint64) (*types.MessageReceipt, error) { diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go index e3c06c293..ecfc51648 100644 --- a/chain/stmgr/stmgr.go +++ b/chain/stmgr/stmgr.go @@ -6,12 +6,12 @@ import ( "sync" amt "github.com/filecoin-project/go-amt-ipld" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "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" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" diff --git a/chain/stmgr/utils.go b/chain/stmgr/utils.go index d6c2f0dec..025a8deb7 100644 --- a/chain/stmgr/utils.go +++ b/chain/stmgr/utils.go @@ -2,10 +2,10 @@ package stmgr import ( "context" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" amt "github.com/filecoin-project/go-amt-ipld" cid "github.com/ipfs/go-cid" diff --git a/chain/store/fts.go b/chain/store/fts.go index 19801174c..f9ec4459e 100644 --- a/chain/store/fts.go +++ b/chain/store/fts.go @@ -1,7 +1,7 @@ package store import ( - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" ) diff --git a/chain/store/store.go b/chain/store/store.go index 9845be29f..807188c85 100644 --- a/chain/store/store.go +++ b/chain/store/store.go @@ -7,15 +7,15 @@ import ( "fmt" "sync" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/vm" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/vm" "go.opencensus.io/trace" "go.uber.org/zap" amt "github.com/filecoin-project/go-amt-ipld" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" block "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" diff --git a/chain/store/weight.go b/chain/store/weight.go index 09d1db00a..cf992554a 100644 --- a/chain/store/weight.go +++ b/chain/store/weight.go @@ -2,10 +2,10 @@ package store import ( "context" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" + "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/chain/vm" "golang.org/x/xerrors" "math/big" ) diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go index ab03c999f..ddca848e9 100644 --- a/chain/sub/incoming.go +++ b/chain/sub/incoming.go @@ -6,8 +6,8 @@ import ( logging "github.com/ipfs/go-log" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/types" ) var log = logging.Logger("sub") diff --git a/chain/sync.go b/chain/sync.go index a266c8b60..3d2eeee68 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -7,14 +7,14 @@ import ( "time" "github.com/filecoin-project/go-bls-sigs" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" + "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/address" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" amt "github.com/filecoin-project/go-amt-ipld" "github.com/ipfs/go-cid" diff --git a/chain/sync_test.go b/chain/sync_test.go index 5b2da4932..81bcbf387 100644 --- a/chain/sync_test.go +++ b/chain/sync_test.go @@ -11,15 +11,15 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node" - "github.com/filecoin-project/go-lotus/node/impl" - "github.com/filecoin-project/go-lotus/node/modules" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node" + "github.com/filecoin-project/lotus/node/impl" + "github.com/filecoin-project/lotus/node/modules" + "github.com/filecoin-project/lotus/node/repo" ) const source = 0 diff --git a/chain/syncstate.go b/chain/syncstate.go index e7452dd8e..2a5ea6899 100644 --- a/chain/syncstate.go +++ b/chain/syncstate.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/types" ) func SyncStageString(v api.SyncStateStage) string { diff --git a/chain/types/ask.go b/chain/types/ask.go index 4b8a8feb3..da0684f86 100644 --- a/chain/types/ask.go +++ b/chain/types/ask.go @@ -1,7 +1,7 @@ package types import ( - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" cbor "github.com/ipfs/go-ipld-cbor" ) diff --git a/chain/types/bigint.go b/chain/types/bigint.go index 1bbe9045e..b3927155f 100644 --- a/chain/types/bigint.go +++ b/chain/types/bigint.go @@ -6,7 +6,7 @@ import ( "io" "math/big" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" cbor "github.com/ipfs/go-ipld-cbor" "github.com/polydawn/refmt/obj/atlas" diff --git a/chain/types/bitfield.go b/chain/types/bitfield.go index b309347d6..617229c37 100644 --- a/chain/types/bitfield.go +++ b/chain/types/bitfield.go @@ -5,7 +5,7 @@ import ( "io" "sort" - "github.com/filecoin-project/go-lotus/extern/rleplus" + "github.com/filecoin-project/lotus/extern/rleplus" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" ) diff --git a/chain/types/blockheader.go b/chain/types/blockheader.go index 59858a1a6..a82bf37a2 100644 --- a/chain/types/blockheader.go +++ b/chain/types/blockheader.go @@ -12,7 +12,7 @@ import ( "go.opencensus.io/trace" xerrors "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" ) type Ticket struct { diff --git a/chain/types/blockheader_test.go b/chain/types/blockheader_test.go index 6af560423..d32e8bdce 100644 --- a/chain/types/blockheader_test.go +++ b/chain/types/blockheader_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" cid "github.com/ipfs/go-cid" ) diff --git a/chain/types/message.go b/chain/types/message.go index b00783b20..d64e017b8 100644 --- a/chain/types/message.go +++ b/chain/types/message.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" ) type Message struct { diff --git a/chain/types/signature_cgo.go b/chain/types/signature_cgo.go index 5d60151a6..901cab944 100644 --- a/chain/types/signature_cgo.go +++ b/chain/types/signature_cgo.go @@ -6,8 +6,8 @@ import ( "fmt" bls "github.com/filecoin-project/go-bls-sigs" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/lib/crypto" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/lib/crypto" "github.com/minio/blake2b-simd" ) diff --git a/chain/types/types_test.go b/chain/types/types_test.go index 38d16c0d2..6bd4c0883 100644 --- a/chain/types/types_test.go +++ b/chain/types/types_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" ) func blsaddr(n int64) address.Address { diff --git a/chain/types/vmcontext.go b/chain/types/vmcontext.go index 89659da00..388396881 100644 --- a/chain/types/vmcontext.go +++ b/chain/types/vmcontext.go @@ -4,8 +4,8 @@ import ( "context" amt "github.com/filecoin-project/go-amt-ipld" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" cid "github.com/ipfs/go-cid" hamt "github.com/ipfs/go-hamt-ipld" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/chain/types/voucher.go b/chain/types/voucher.go index 0ce563cdc..7855b21a2 100644 --- a/chain/types/voucher.go +++ b/chain/types/voucher.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/base64" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" cbor "github.com/ipfs/go-ipld-cbor" ) diff --git a/chain/types_test.go b/chain/types_test.go index 17a6f3408..f0cf4afb5 100644 --- a/chain/types_test.go +++ b/chain/types_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func TestSignedMessageJsonRoundtrip(t *testing.T) { diff --git a/chain/vm/invoker.go b/chain/vm/invoker.go index ef9ffa9f5..713f64d39 100644 --- a/chain/vm/invoker.go +++ b/chain/vm/invoker.go @@ -9,9 +9,9 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/types" ) type invoker struct { diff --git a/chain/vm/invoker_test.go b/chain/vm/invoker_test.go index afa339873..e326d0e70 100644 --- a/chain/vm/invoker_test.go +++ b/chain/vm/invoker_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/types" ) type basicContract struct{} diff --git a/chain/vm/mkactor.go b/chain/vm/mkactor.go index 5c97bb32e..6b0fc4ca4 100644 --- a/chain/vm/mkactor.go +++ b/chain/vm/mkactor.go @@ -8,11 +8,11 @@ import ( hamt "github.com/ipfs/go-hamt-ipld" bstore "github.com/ipfs/go-ipfs-blockstore" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/aerrors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/types" ) func init() { diff --git a/chain/vm/vm.go b/chain/vm/vm.go index 3c30f3cc1..7e990e4d5 100644 --- a/chain/vm/vm.go +++ b/chain/vm/vm.go @@ -6,13 +6,13 @@ import ( blockstore "github.com/ipfs/go-ipfs-blockstore" "math/big" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/actors/aerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/bufbstore" + "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/address" + "github.com/filecoin-project/lotus/chain/state" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/bufbstore" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/trace" diff --git a/chain/vm/vm_test.go b/chain/vm/vm_test.go index 6c8c09600..7e4dd3e12 100644 --- a/chain/vm/vm_test.go +++ b/chain/vm/vm_test.go @@ -5,8 +5,8 @@ import ( "math/big" "testing" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" ) func TestBlockReward(t *testing.T) { diff --git a/chain/wallet/memkeystore.go b/chain/wallet/memkeystore.go index bd6e3dc89..9844083c4 100644 --- a/chain/wallet/memkeystore.go +++ b/chain/wallet/memkeystore.go @@ -1,7 +1,7 @@ package wallet import ( - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) type MemKeyStore struct { diff --git a/chain/wallet/wallet.go b/chain/wallet/wallet.go index dad6b7db6..91881da2c 100644 --- a/chain/wallet/wallet.go +++ b/chain/wallet/wallet.go @@ -11,9 +11,9 @@ import ( "github.com/minio/blake2b-simd" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/crypto" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/crypto" ) const ( diff --git a/cli/auth.go b/cli/auth.go index e56f7676f..44287c4e0 100644 --- a/cli/auth.go +++ b/cli/auth.go @@ -5,7 +5,7 @@ import ( "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" ) var authCmd = &cli.Command{ diff --git a/cli/chain.go b/cli/chain.go index d25c9f28f..0e948d36c 100644 --- a/cli/chain.go +++ b/cli/chain.go @@ -11,8 +11,8 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - types "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + types "github.com/filecoin-project/lotus/chain/types" ) var chainCmd = &cli.Command{ diff --git a/cli/client.go b/cli/client.go index 23dcc43cd..d2a163a01 100644 --- a/cli/client.go +++ b/cli/client.go @@ -9,9 +9,9 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - actors "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + actors "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) var clientCmd = &cli.Command{ diff --git a/cli/cmd.go b/cli/cmd.go index 03e56dbf6..f80c80453 100644 --- a/cli/cmd.go +++ b/cli/cmd.go @@ -12,10 +12,10 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/api/client" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/client" + "github.com/filecoin-project/lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/node/repo" ) var log = logging.Logger("cli") diff --git a/cli/createminer.go b/cli/createminer.go index 9f3df77b0..551528613 100644 --- a/cli/createminer.go +++ b/cli/createminer.go @@ -7,9 +7,9 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - actors "github.com/filecoin-project/go-lotus/chain/actors" - address "github.com/filecoin-project/go-lotus/chain/address" - types "github.com/filecoin-project/go-lotus/chain/types" + actors "github.com/filecoin-project/lotus/chain/actors" + address "github.com/filecoin-project/lotus/chain/address" + types "github.com/filecoin-project/lotus/chain/types" "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/cli/net.go b/cli/net.go index 22d3b0a3a..5fea84a4d 100644 --- a/cli/net.go +++ b/cli/net.go @@ -5,7 +5,7 @@ import ( "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/lib/addrutil" + "github.com/filecoin-project/lotus/lib/addrutil" ) var netCmd = &cli.Command{ diff --git a/cli/params.go b/cli/params.go index e15a55a25..6f6017ca3 100644 --- a/cli/params.go +++ b/cli/params.go @@ -1,7 +1,7 @@ package cli import ( - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" ) diff --git a/cli/paych.go b/cli/paych.go index 834c35cc0..3b018bc1d 100644 --- a/cli/paych.go +++ b/cli/paych.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/filecoin-project/go-lotus/chain/address" - types "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + types "github.com/filecoin-project/lotus/chain/types" "gopkg.in/urfave/cli.v2" ) diff --git a/cli/send.go b/cli/send.go index 4727af706..512a9a14b 100644 --- a/cli/send.go +++ b/cli/send.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" "gopkg.in/urfave/cli.v2" ) diff --git a/cli/state.go b/cli/state.go index 5152b1215..6d18308f1 100644 --- a/cli/state.go +++ b/cli/state.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" "gopkg.in/urfave/cli.v2" diff --git a/cli/sync.go b/cli/sync.go index 2f9343d78..ab50889c1 100644 --- a/cli/sync.go +++ b/cli/sync.go @@ -7,8 +7,8 @@ import ( cid "github.com/ipfs/go-cid" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain" ) var syncCmd = &cli.Command{ diff --git a/cli/wallet.go b/cli/wallet.go index 6394526ed..922f021e9 100644 --- a/cli/wallet.go +++ b/cli/wallet.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/filecoin-project/go-lotus/chain/address" - types "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + types "github.com/filecoin-project/lotus/chain/types" "gopkg.in/urfave/cli.v2" ) diff --git a/cmd/chain-noise/main.go b/cmd/chain-noise/main.go index 15d62be8f..96d128d7b 100644 --- a/cmd/chain-noise/main.go +++ b/cmd/chain-noise/main.go @@ -7,10 +7,10 @@ import ( "os" "time" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - lcli "github.com/filecoin-project/go-lotus/cli" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" "gopkg.in/urfave/cli.v2" ) diff --git a/cmd/lotus-fountain/main.go b/cmd/lotus-fountain/main.go index 7f648145d..1a7a87ce4 100644 --- a/cmd/lotus-fountain/main.go +++ b/cmd/lotus-fountain/main.go @@ -11,11 +11,11 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - lcli "github.com/filecoin-project/go-lotus/cli" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" ) var log = logging.Logger("main") diff --git a/cmd/lotus-storage-miner/info.go b/cmd/lotus-storage-miner/info.go index 5d55efcf5..0f34d7b28 100644 --- a/cmd/lotus-storage-miner/info.go +++ b/cmd/lotus-storage-miner/info.go @@ -6,9 +6,9 @@ import ( "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/types" - lcli "github.com/filecoin-project/go-lotus/cli" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" sectorstate "github.com/filecoin-project/go-sectorbuilder/sealing_state" ) diff --git a/cmd/lotus-storage-miner/init.go b/cmd/lotus-storage-miner/init.go index 59ff2e91a..e2b96a60d 100644 --- a/cmd/lotus-storage-miner/init.go +++ b/cmd/lotus-storage-miner/init.go @@ -11,13 +11,13 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - lcli "github.com/filecoin-project/go-lotus/cli" - "github.com/filecoin-project/go-lotus/node/repo" + "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/address" + "github.com/filecoin-project/lotus/chain/types" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/node/repo" ) var initCmd = &cli.Command{ diff --git a/cmd/lotus-storage-miner/main.go b/cmd/lotus-storage-miner/main.go index b7360f7e8..c9a904695 100644 --- a/cmd/lotus-storage-miner/main.go +++ b/cmd/lotus-storage-miner/main.go @@ -7,9 +7,9 @@ import ( "go.opencensus.io/trace" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/build" - lcli "github.com/filecoin-project/go-lotus/cli" - "github.com/filecoin-project/go-lotus/tracing" + "github.com/filecoin-project/lotus/build" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/tracing" ) var log = logging.Logger("main") diff --git a/cmd/lotus-storage-miner/run.go b/cmd/lotus-storage-miner/run.go index a2e50f520..d0806eb16 100644 --- a/cmd/lotus-storage-miner/run.go +++ b/cmd/lotus-storage-miner/run.go @@ -8,20 +8,20 @@ import ( "os/signal" "syscall" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" "github.com/multiformats/go-multiaddr" "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - lcli "github.com/filecoin-project/go-lotus/cli" - "github.com/filecoin-project/go-lotus/lib/auth" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/node" - "github.com/filecoin-project/go-lotus/node/modules" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/lib/auth" + "github.com/filecoin-project/lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/node" + "github.com/filecoin-project/lotus/node/modules" + "github.com/filecoin-project/lotus/node/repo" ) var runCmd = &cli.Command{ diff --git a/cmd/lotus-storage-miner/sectors.go b/cmd/lotus-storage-miner/sectors.go index 8011db4cd..deede68ad 100644 --- a/cmd/lotus-storage-miner/sectors.go +++ b/cmd/lotus-storage-miner/sectors.go @@ -6,7 +6,7 @@ import ( "gopkg.in/urfave/cli.v2" - lcli "github.com/filecoin-project/go-lotus/cli" + lcli "github.com/filecoin-project/lotus/cli" ) var storeGarbageCmd = &cli.Command{ diff --git a/cmd/lotus-townhall/main.go b/cmd/lotus-townhall/main.go index 54f5e91c5..9be633147 100644 --- a/cmd/lotus-townhall/main.go +++ b/cmd/lotus-townhall/main.go @@ -14,8 +14,8 @@ import ( pnet "github.com/libp2p/go-libp2p-pnet" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/filecoin-project/go-lotus/lib/addrutil" - "github.com/filecoin-project/go-lotus/node/modules/lp2p" + "github.com/filecoin-project/lotus/lib/addrutil" + "github.com/filecoin-project/lotus/node/modules/lp2p" ) const topic = "/fil/headnotifs/bafy2bzacea77zxnepp7wuqqgpj7xcw2ywwmmcmtrbjghhv4g2dildogpv6roi" diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index 075de8b39..08441285b 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -10,12 +10,12 @@ import ( "golang.org/x/xerrors" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/node" - "github.com/filecoin-project/go-lotus/node/modules" - "github.com/filecoin-project/go-lotus/node/modules/testing" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/node" + "github.com/filecoin-project/lotus/node/modules" + "github.com/filecoin-project/lotus/node/modules/testing" + "github.com/filecoin-project/lotus/node/repo" ) const ( diff --git a/cmd/lotus/main.go b/cmd/lotus/main.go index 894ca0b09..7834ff423 100644 --- a/cmd/lotus/main.go +++ b/cmd/lotus/main.go @@ -8,9 +8,9 @@ import ( "go.opencensus.io/trace" "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/go-lotus/build" - lcli "github.com/filecoin-project/go-lotus/cli" - "github.com/filecoin-project/go-lotus/tracing" + "github.com/filecoin-project/lotus/build" + lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/tracing" ) func main() { diff --git a/cmd/lotus/rpc.go b/cmd/lotus/rpc.go index edf32b8e5..598be1f7d 100644 --- a/cmd/lotus/rpc.go +++ b/cmd/lotus/rpc.go @@ -8,10 +8,10 @@ import ( "os/signal" "syscall" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/lib/auth" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" - "github.com/filecoin-project/go-lotus/node" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/lib/auth" + "github.com/filecoin-project/lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/node" logging "github.com/ipfs/go-log" ) diff --git a/extern/rleplus/internal/bitvector_test.go b/extern/rleplus/internal/bitvector_test.go index a98c00a8e..2895db3a3 100644 --- a/extern/rleplus/internal/bitvector_test.go +++ b/extern/rleplus/internal/bitvector_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - bitvector "github.com/filecoin-project/go-lotus/extern/rleplus/internal" + bitvector "github.com/filecoin-project/lotus/extern/rleplus/internal" ) func TestBitVector(t *testing.T) { diff --git a/extern/rleplus/rleplus.go b/extern/rleplus/rleplus.go index 6a9d8dacb..5d09c2e18 100644 --- a/extern/rleplus/rleplus.go +++ b/extern/rleplus/rleplus.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - bitvector "github.com/filecoin-project/go-lotus/extern/rleplus/internal" + bitvector "github.com/filecoin-project/lotus/extern/rleplus/internal" ) // Version is the 2 lowest bits of this constant diff --git a/extern/rleplus/rleplus_test.go b/extern/rleplus/rleplus_test.go index f740a5597..a45bc7b82 100644 --- a/extern/rleplus/rleplus_test.go +++ b/extern/rleplus/rleplus_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/filecoin-project/go-lotus/extern/rleplus" - bitvector "github.com/filecoin-project/go-lotus/extern/rleplus/internal" + "github.com/filecoin-project/lotus/extern/rleplus" + bitvector "github.com/filecoin-project/lotus/extern/rleplus/internal" "gotest.tools/assert" ) diff --git a/gen/main.go b/gen/main.go index e2f803ae2..7dfcb0dbb 100644 --- a/gen/main.go +++ b/gen/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/types" gen "github.com/whyrusleeping/cbor-gen" ) diff --git a/go.mod b/go.mod index 1e7f6bf81..8df04c5d1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/filecoin-project/go-lotus +module github.com/filecoin-project/lotus go 1.13 diff --git a/lib/auth/handler.go b/lib/auth/handler.go index 380f60f70..c47a4d789 100644 --- a/lib/auth/handler.go +++ b/lib/auth/handler.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" logging "github.com/ipfs/go-log" ) diff --git a/lib/crypto/crypto_test.go b/lib/crypto/crypto_test.go index bc86e1be2..15c0f6772 100644 --- a/lib/crypto/crypto_test.go +++ b/lib/crypto/crypto_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/filecoin-project/go-lotus/lib/crypto" + "github.com/filecoin-project/lotus/lib/crypto" ) func TestGenerateKey(t *testing.T) { diff --git a/lib/sectorbuilder/sectorbuilder.go b/lib/sectorbuilder/sectorbuilder.go index f6c412a83..242259e30 100644 --- a/lib/sectorbuilder/sectorbuilder.go +++ b/lib/sectorbuilder/sectorbuilder.go @@ -12,7 +12,7 @@ import ( logging "github.com/ipfs/go-log" - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" ) var log = logging.Logger("sectorbuilder") diff --git a/lib/sectorbuilder/sectorbuilder_test.go b/lib/sectorbuilder/sectorbuilder_test.go index fe346dcb3..19119ce09 100644 --- a/lib/sectorbuilder/sectorbuilder_test.go +++ b/lib/sectorbuilder/sectorbuilder_test.go @@ -6,9 +6,9 @@ import ( "math/rand" "testing" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/storage/sector" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/storage/sector" ) func TestSealAndVerify(t *testing.T) { diff --git a/lotuspond/api.go b/lotuspond/api.go index c3bee1ea8..2bd87c0b9 100644 --- a/lotuspond/api.go +++ b/lotuspond/api.go @@ -2,8 +2,8 @@ package main import ( "crypto/rand" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/node/repo" "io" "io/ioutil" "os" diff --git a/lotuspond/main.go b/lotuspond/main.go index 018b2562f..d3238dad7 100644 --- a/lotuspond/main.go +++ b/lotuspond/main.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/lib/jsonrpc" "gopkg.in/urfave/cli.v2" ) diff --git a/miner/miner.go b/miner/miner.go index af78f4cea..9f7c44478 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/impl/full" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/impl/full" logging "github.com/ipfs/go-log" "github.com/pkg/errors" diff --git a/miner/miner_test.go b/miner/miner_test.go index 5bbda8318..160433d72 100644 --- a/miner/miner_test.go +++ b/miner/miner_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func mustIDAddr(i uint64) address.Address { diff --git a/node/builder.go b/node/builder.go index 33a11e1c1..00ab37328 100644 --- a/node/builder.go +++ b/node/builder.go @@ -17,32 +17,32 @@ import ( record "github.com/libp2p/go-libp2p-record" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/deals" - "github.com/filecoin-project/go-lotus/chain/metrics" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/miner" - "github.com/filecoin-project/go-lotus/node/config" - "github.com/filecoin-project/go-lotus/node/hello" - "github.com/filecoin-project/go-lotus/node/impl" - "github.com/filecoin-project/go-lotus/node/modules" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/modules/helpers" - "github.com/filecoin-project/go-lotus/node/modules/lp2p" - "github.com/filecoin-project/go-lotus/node/modules/testing" - "github.com/filecoin-project/go-lotus/node/repo" - "github.com/filecoin-project/go-lotus/paych" - "github.com/filecoin-project/go-lotus/retrieval" - "github.com/filecoin-project/go-lotus/retrieval/discovery" - "github.com/filecoin-project/go-lotus/storage" - "github.com/filecoin-project/go-lotus/storage/commitment" - "github.com/filecoin-project/go-lotus/storage/sector" - "github.com/filecoin-project/go-lotus/storage/sectorblocks" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/deals" + "github.com/filecoin-project/lotus/chain/metrics" + "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/wallet" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/miner" + "github.com/filecoin-project/lotus/node/config" + "github.com/filecoin-project/lotus/node/hello" + "github.com/filecoin-project/lotus/node/impl" + "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/paych" + "github.com/filecoin-project/lotus/retrieval" + "github.com/filecoin-project/lotus/retrieval/discovery" + "github.com/filecoin-project/lotus/storage" + "github.com/filecoin-project/lotus/storage/commitment" + "github.com/filecoin-project/lotus/storage/sector" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) // special is a type used to give keys to modules which diff --git a/node/hello/hello.go b/node/hello/hello.go index 279a46fd3..3d63dbc1d 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -3,7 +3,7 @@ package hello import ( "context" "fmt" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" @@ -12,9 +12,9 @@ import ( inet "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/lib/cborrpc" ) const ProtocolID = "/fil/hello/1.0.0" diff --git a/node/impl/client/client.go b/node/impl/client/client.go index 2bc8128ee..a06e211ef 100644 --- a/node/impl/client/client.go +++ b/node/impl/client/client.go @@ -20,18 +20,18 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/deals" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/impl/full" - "github.com/filecoin-project/go-lotus/node/impl/paych" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/retrieval" - "github.com/filecoin-project/go-lotus/retrieval/discovery" + "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/address" + "github.com/filecoin-project/lotus/chain/deals" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "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/retrieval" + "github.com/filecoin-project/lotus/retrieval/discovery" ) type API struct { diff --git a/node/impl/common.go b/node/impl/common.go index 0e2080212..26b0eef44 100644 --- a/node/impl/common.go +++ b/node/impl/common.go @@ -11,9 +11,9 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) type CommonAPI struct { diff --git a/node/impl/full.go b/node/impl/full.go index 851ff9eec..41c0730bf 100644 --- a/node/impl/full.go +++ b/node/impl/full.go @@ -3,15 +3,15 @@ package impl import ( "context" - "github.com/filecoin-project/go-lotus/node/impl/client" - "github.com/filecoin-project/go-lotus/node/impl/paych" + "github.com/filecoin-project/lotus/node/impl/client" + "github.com/filecoin-project/lotus/node/impl/paych" logging "github.com/ipfs/go-log" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/miner" - "github.com/filecoin-project/go-lotus/node/impl/full" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/miner" + "github.com/filecoin-project/lotus/node/impl/full" ) var log = logging.Logger("node") diff --git a/node/impl/full/chain.go b/node/impl/full/chain.go index f7670d303..fd3a91d66 100644 --- a/node/impl/full/chain.go +++ b/node/impl/full/chain.go @@ -3,9 +3,9 @@ package full import ( "context" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" "golang.org/x/xerrors" "github.com/ipfs/go-cid" diff --git a/node/impl/full/mpool.go b/node/impl/full/mpool.go index e19df4249..66cdf873b 100644 --- a/node/impl/full/mpool.go +++ b/node/impl/full/mpool.go @@ -6,9 +6,9 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) type MpoolAPI struct { diff --git a/node/impl/full/state.go b/node/impl/full/state.go index c67571fba..135317ca9 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -9,17 +9,17 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/state" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/vm" - "github.com/filecoin-project/go-lotus/chain/wallet" - "github.com/filecoin-project/go-lotus/lib/bufbstore" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/state" + "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/chain/wallet" + "github.com/filecoin-project/lotus/lib/bufbstore" ) type StateAPI struct { diff --git a/node/impl/full/sync.go b/node/impl/full/sync.go index ca06d934e..a9d2d3aa5 100644 --- a/node/impl/full/sync.go +++ b/node/impl/full/sync.go @@ -3,9 +3,9 @@ package full import ( "context" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/types" pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" diff --git a/node/impl/full/wallet.go b/node/impl/full/wallet.go index 01d0ee79c..809a938bc 100644 --- a/node/impl/full/wallet.go +++ b/node/impl/full/wallet.go @@ -3,10 +3,10 @@ package full import ( "context" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/impl/paych/paych.go b/node/impl/paych/paych.go index 30cdf53da..b89980a00 100644 --- a/node/impl/paych/paych.go +++ b/node/impl/paych/paych.go @@ -8,12 +8,12 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - full "github.com/filecoin-project/go-lotus/node/impl/full" - "github.com/filecoin-project/go-lotus/paych" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + full "github.com/filecoin-project/lotus/node/impl/full" + "github.com/filecoin-project/lotus/paych" ) type PaychAPI struct { diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 995c20da6..3ced1e3e2 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -6,13 +6,13 @@ import ( "io" "math/rand" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/storage" - "github.com/filecoin-project/go-lotus/storage/sector" - "github.com/filecoin-project/go-lotus/storage/sectorblocks" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/storage" + "github.com/filecoin-project/lotus/storage/sector" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) type StorageMinerAPI struct { diff --git a/node/modules/chain.go b/node/modules/chain.go index 6ca34cfb3..17008d30a 100644 --- a/node/modules/chain.go +++ b/node/modules/chain.go @@ -15,11 +15,11 @@ import ( "go.uber.org/fx" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/modules/helpers" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/repo" ) func ChainExchange(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.Routing, bs dtypes.ChainGCBlockstore) dtypes.ChainExchange { diff --git a/node/modules/client.go b/node/modules/client.go index 3fa87ad00..2171b96c3 100644 --- a/node/modules/client.go +++ b/node/modules/client.go @@ -2,7 +2,7 @@ package modules import ( "context" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/helpers" "github.com/ipfs/go-bitswap" "github.com/ipfs/go-bitswap/network" "github.com/libp2p/go-libp2p-core/host" @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-merkledag" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/repo" ) func ClientFstore(r repo.LockedRepo) (dtypes.ClientFilestore, error) { diff --git a/node/modules/core.go b/node/modules/core.go index 1b9b8b109..bde386d67 100644 --- a/node/modules/core.go +++ b/node/modules/core.go @@ -3,9 +3,9 @@ package modules import ( "context" "crypto/rand" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/lib/addrutil" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/lib/addrutil" + "github.com/filecoin-project/lotus/node/modules/helpers" "github.com/gbrlsnchs/jwt/v3" logging "github.com/ipfs/go-log" "github.com/libp2p/go-libp2p-core/host" @@ -17,10 +17,10 @@ import ( "io/ioutil" "time" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/repo" ) var log = logging.Logger("modules") diff --git a/node/modules/lp2p/discovery.go b/node/modules/lp2p/discovery.go index 66111173d..0f4201c60 100644 --- a/node/modules/lp2p/discovery.go +++ b/node/modules/lp2p/discovery.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/p2p/discovery" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/helpers" ) const discoveryConnTimeout = time.Second * 30 diff --git a/node/modules/lp2p/host.go b/node/modules/lp2p/host.go index 3a6386de2..5abff7803 100644 --- a/node/modules/lp2p/host.go +++ b/node/modules/lp2p/host.go @@ -16,8 +16,8 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/modules/helpers" ) type P2PHostIn struct { diff --git a/node/modules/lp2p/libp2p.go b/node/modules/lp2p/libp2p.go index 74fbc516d..511b5c775 100644 --- a/node/modules/lp2p/libp2p.go +++ b/node/modules/lp2p/libp2p.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "time" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" "golang.org/x/xerrors" logging "github.com/ipfs/go-log" diff --git a/node/modules/lp2p/nat.go b/node/modules/lp2p/nat.go index 4b77dc113..553cc27ce 100644 --- a/node/modules/lp2p/nat.go +++ b/node/modules/lp2p/nat.go @@ -13,7 +13,7 @@ import ( "github.com/ipfs/go-ipfs/repo" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/helpers" ) func AutoNATService(quic bool) func(repo repo.Repo, mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host) error { diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index b8ecbc0c8..3795666c4 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -5,7 +5,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/helpers" ) func FloodSub(pubsubOptions ...pubsub.Option) interface{} { diff --git a/node/modules/lp2p/relay.go b/node/modules/lp2p/relay.go index 651ac0b47..10e776c83 100644 --- a/node/modules/lp2p/relay.go +++ b/node/modules/lp2p/relay.go @@ -12,7 +12,7 @@ import ( relay "github.com/libp2p/go-libp2p/p2p/host/relay" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/modules/helpers" ) func Relay(disable, enableHop bool) func() (opts Libp2pOpts, err error) { diff --git a/node/modules/services.go b/node/modules/services.go index 95d25961b..ef6795daa 100644 --- a/node/modules/services.go +++ b/node/modules/services.go @@ -8,13 +8,13 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/chain" - "github.com/filecoin-project/go-lotus/chain/deals" - "github.com/filecoin-project/go-lotus/chain/sub" - "github.com/filecoin-project/go-lotus/node/hello" - "github.com/filecoin-project/go-lotus/node/modules/helpers" - "github.com/filecoin-project/go-lotus/retrieval/discovery" - "github.com/filecoin-project/go-lotus/storage/sector" + "github.com/filecoin-project/lotus/chain" + "github.com/filecoin-project/lotus/chain/deals" + "github.com/filecoin-project/lotus/chain/sub" + "github.com/filecoin-project/lotus/node/hello" + "github.com/filecoin-project/lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/retrieval/discovery" + "github.com/filecoin-project/lotus/storage/sector" ) func RunHello(mctx helpers.MetricsCtx, lc fx.Lifecycle, h host.Host, svc *hello.Service) { diff --git a/node/modules/storage.go b/node/modules/storage.go index 6a467830b..1bdce1d2f 100644 --- a/node/modules/storage.go +++ b/node/modules/storage.go @@ -5,9 +5,9 @@ import ( "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/repo" ) func LockedRepo(lr repo.LockedRepo) func(lc fx.Lifecycle) repo.LockedRepo { diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index 83e507e55..009ba57b2 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -15,18 +15,18 @@ import ( "github.com/mitchellh/go-homedir" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/deals" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" - "github.com/filecoin-project/go-lotus/node/modules/helpers" - "github.com/filecoin-project/go-lotus/node/repo" - "github.com/filecoin-project/go-lotus/retrieval" - "github.com/filecoin-project/go-lotus/storage" - "github.com/filecoin-project/go-lotus/storage/commitment" - "github.com/filecoin-project/go-lotus/storage/sector" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/deals" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/modules/helpers" + "github.com/filecoin-project/lotus/node/repo" + "github.com/filecoin-project/lotus/retrieval" + "github.com/filecoin-project/lotus/storage" + "github.com/filecoin-project/lotus/storage/commitment" + "github.com/filecoin-project/lotus/storage/sector" ) func minerAddrFromDS(ds dtypes.MetadataDS) (address.Address, error) { diff --git a/node/modules/testing/genesis.go b/node/modules/testing/genesis.go index eba309f55..b53e33319 100644 --- a/node/modules/testing/genesis.go +++ b/node/modules/testing/genesis.go @@ -15,12 +15,12 @@ import ( "github.com/ipfs/go-merkledag" peer "github.com/libp2p/go-libp2p-peer" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/gen" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/chain/wallet" - "github.com/filecoin-project/go-lotus/node/modules" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/gen" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/node/modules" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var glog = logging.Logger("genesis") diff --git a/node/node_test.go b/node/node_test.go index 2dbd38485..e3ad41ea9 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -16,19 +16,19 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/api/client" - "github.com/filecoin-project/go-lotus/api/test" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/jsonrpc" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/miner" - "github.com/filecoin-project/go-lotus/node" - "github.com/filecoin-project/go-lotus/node/modules" - modtest "github.com/filecoin-project/go-lotus/node/modules/testing" - "github.com/filecoin-project/go-lotus/node/repo" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/api/client" + "github.com/filecoin-project/lotus/api/test" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/jsonrpc" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/miner" + "github.com/filecoin-project/lotus/node" + "github.com/filecoin-project/lotus/node/modules" + modtest "github.com/filecoin-project/lotus/node/modules/testing" + "github.com/filecoin-project/lotus/node/repo" ) func testStorageNode(ctx context.Context, t *testing.T, waddr address.Address, act address.Address, tnd test.TestNode) test.TestStorageNode { diff --git a/node/repo/fsrepo.go b/node/repo/fsrepo.go index ab33eda95..5412dd9a8 100644 --- a/node/repo/fsrepo.go +++ b/node/repo/fsrepo.go @@ -19,8 +19,8 @@ import ( "github.com/multiformats/go-multiaddr" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/config" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/config" ) const ( diff --git a/node/repo/interface.go b/node/repo/interface.go index c769e230c..964bc31d4 100644 --- a/node/repo/interface.go +++ b/node/repo/interface.go @@ -6,8 +6,8 @@ import ( "github.com/ipfs/go-datastore" "github.com/multiformats/go-multiaddr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/config" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/config" ) var ( diff --git a/node/repo/memrepo.go b/node/repo/memrepo.go index 4fd64e30b..d8a0082f8 100644 --- a/node/repo/memrepo.go +++ b/node/repo/memrepo.go @@ -9,8 +9,8 @@ import ( "github.com/multiformats/go-multiaddr" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/config" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/config" ) type MemRepo struct { diff --git a/node/repo/repo_test.go b/node/repo/repo_test.go index f05118c4c..035740823 100644 --- a/node/repo/repo_test.go +++ b/node/repo/repo_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/config" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/config" ) func basicTest(t *testing.T, repo Repo) { diff --git a/node/testopts.go b/node/testopts.go index 5ec7a66bc..f348fc555 100644 --- a/node/testopts.go +++ b/node/testopts.go @@ -5,7 +5,7 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" - "github.com/filecoin-project/go-lotus/node/modules/lp2p" + "github.com/filecoin-project/lotus/node/modules/lp2p" ) func MockHost(mn mocknet.Mocknet) Option { diff --git a/paych/paych.go b/paych/paych.go index 60b1e0eac..61c6bd5c1 100644 --- a/paych/paych.go +++ b/paych/paych.go @@ -12,11 +12,11 @@ import ( logging "github.com/ipfs/go-log" "go.uber.org/fx" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/stmgr" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/impl/full" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/stmgr" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/impl/full" ) var log = logging.Logger("paych") diff --git a/paych/simple.go b/paych/simple.go index 0e057a535..d8a3f4163 100644 --- a/paych/simple.go +++ b/paych/simple.go @@ -6,9 +6,9 @@ import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func (pm *Manager) createPaych(ctx context.Context, from, to address.Address, amt types.BigInt) (address.Address, cid.Cid, error) { diff --git a/paych/state.go b/paych/state.go index 40ed82d38..4785d547f 100644 --- a/paych/state.go +++ b/paych/state.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" ) func (pm *Manager) loadPaychState(ctx context.Context, ch address.Address) (*types.Actor, *actors.PaymentChannelActorState, error) { diff --git a/paych/store.go b/paych/store.go index 38169d5eb..cc78b4b5b 100644 --- a/paych/store.go +++ b/paych/store.go @@ -12,9 +12,9 @@ import ( cbor "github.com/ipfs/go-ipld-cbor" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var ErrChannelNotTracked = errors.New("channel not tracked") diff --git a/retrieval/client.go b/retrieval/client.go index 7a4d5b369..ec086ef49 100644 --- a/retrieval/client.go +++ b/retrieval/client.go @@ -14,14 +14,14 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/cborrpc" - payapi "github.com/filecoin-project/go-lotus/node/impl/paych" - "github.com/filecoin-project/go-lotus/paych" - "github.com/filecoin-project/go-lotus/retrieval/discovery" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborrpc" + payapi "github.com/filecoin-project/lotus/node/impl/paych" + "github.com/filecoin-project/lotus/paych" + "github.com/filecoin-project/lotus/retrieval/discovery" ) var log = logging.Logger("retrieval") diff --git a/retrieval/discovery/discovery.go b/retrieval/discovery/discovery.go index 21a555fc6..a10949f50 100644 --- a/retrieval/discovery/discovery.go +++ b/retrieval/discovery/discovery.go @@ -1,7 +1,7 @@ package discovery import ( - "github.com/filecoin-project/go-lotus/chain/address" + "github.com/filecoin-project/lotus/chain/address" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/libp2p/go-libp2p-core/peer" diff --git a/retrieval/discovery/local.go b/retrieval/discovery/local.go index 512ea12a5..1ca99db9c 100644 --- a/retrieval/discovery/local.go +++ b/retrieval/discovery/local.go @@ -8,7 +8,7 @@ import ( cbor "github.com/ipfs/go-ipld-cbor" logging "github.com/ipfs/go-log" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var log = logging.Logger("ret-discovery") diff --git a/retrieval/miner.go b/retrieval/miner.go index 9bb038e42..350177fe2 100644 --- a/retrieval/miner.go +++ b/retrieval/miner.go @@ -11,11 +11,11 @@ import ( "github.com/libp2p/go-libp2p-core/network" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/cborrpc" - "github.com/filecoin-project/go-lotus/storage/sectorblocks" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/cborrpc" + "github.com/filecoin-project/lotus/storage/sectorblocks" ) type Miner struct { diff --git a/retrieval/types.go b/retrieval/types.go index 60ccc90e1..a7a66ea51 100644 --- a/retrieval/types.go +++ b/retrieval/types.go @@ -1,11 +1,11 @@ package retrieval import ( - "github.com/filecoin-project/go-lotus/api" + "github.com/filecoin-project/lotus/api" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" - "github.com/filecoin-project/go-lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types" ) const ProtocolID = "/fil/retrieval/-1.0.0" // TODO: spec diff --git a/retrieval/verify.go b/retrieval/verify.go index b8cd8d400..88fa0dfed 100644 --- a/retrieval/verify.go +++ b/retrieval/verify.go @@ -12,7 +12,7 @@ import ( pb "github.com/ipfs/go-unixfs/pb" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/build" + "github.com/filecoin-project/lotus/build" ) type BlockVerifier interface { diff --git a/storage/commitment/tracker.go b/storage/commitment/tracker.go index 6caf866bd..ea7cb1515 100644 --- a/storage/commitment/tracker.go +++ b/storage/commitment/tracker.go @@ -12,8 +12,8 @@ import ( logging "github.com/ipfs/go-log" "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/chain/address" + "github.com/filecoin-project/lotus/node/modules/dtypes" ) var log = logging.Logger("commitment") diff --git a/storage/miner.go b/storage/miner.go index bf177b26b..35d726d0c 100644 --- a/storage/miner.go +++ b/storage/miner.go @@ -10,16 +10,16 @@ import ( "github.com/libp2p/go-libp2p-core/host" "github.com/pkg/errors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/address" - "github.com/filecoin-project/go-lotus/chain/events" - "github.com/filecoin-project/go-lotus/chain/store" - "github.com/filecoin-project/go-lotus/chain/types" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/storage/commitment" - "github.com/filecoin-project/go-lotus/storage/sector" + "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/address" + "github.com/filecoin-project/lotus/chain/events" + "github.com/filecoin-project/lotus/chain/store" + "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/storage/commitment" + "github.com/filecoin-project/lotus/storage/sector" ) var log = logging.Logger("storageminer") diff --git a/storage/post.go b/storage/post.go index d1feaa24a..d34069894 100644 --- a/storage/post.go +++ b/storage/post.go @@ -6,10 +6,10 @@ import ( "golang.org/x/xerrors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/build" - "github.com/filecoin-project/go-lotus/chain/actors" - "github.com/filecoin-project/go-lotus/chain/types" + "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" ) func (m *Miner) beginPosting(ctx context.Context) { diff --git a/storage/sector/store.go b/storage/sector/store.go index 4b0683e2d..19ca85363 100644 --- a/storage/sector/store.go +++ b/storage/sector/store.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/lib/sectorbuilder" logging "github.com/ipfs/go-log" ) diff --git a/storage/sectorblocks/blocks.go b/storage/sectorblocks/blocks.go index 90d691660..413cd9d3c 100644 --- a/storage/sectorblocks/blocks.go +++ b/storage/sectorblocks/blocks.go @@ -3,9 +3,9 @@ package sectorblocks import ( "context" "errors" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" - "github.com/filecoin-project/go-lotus/node/modules/dtypes" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/ipfs/go-datastore/namespace" "github.com/ipfs/go-datastore/query" blockstore "github.com/ipfs/go-ipfs-blockstore" @@ -19,7 +19,7 @@ import ( files "github.com/ipfs/go-ipfs-files" cbor "github.com/ipfs/go-ipld-cbor" - "github.com/filecoin-project/go-lotus/storage/sector" + "github.com/filecoin-project/lotus/storage/sector" ) type SealSerialization uint8 diff --git a/storage/sectorblocks/unsealed.go b/storage/sectorblocks/unsealed.go index 042e2c931..d01363a9a 100644 --- a/storage/sectorblocks/unsealed.go +++ b/storage/sectorblocks/unsealed.go @@ -6,8 +6,8 @@ import ( logging "github.com/ipfs/go-log" - "github.com/filecoin-project/go-lotus/api" - "github.com/filecoin-project/go-lotus/lib/sectorbuilder" + "github.com/filecoin-project/lotus/api" + "github.com/filecoin-project/lotus/lib/sectorbuilder" ) var log = logging.Logger("sectorblocks")