From b12482df89279039f7fa1efa566ade05b0c9805a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Sat, 22 Feb 2020 12:36:22 +0100 Subject: [PATCH] move peermgr, tracing into lib --- chain/blocksync/blocksync_client.go | 2 +- cmd/lotus-storage-miner/main.go | 2 +- cmd/lotus/daemon.go | 2 +- cmd/lotus/main.go | 2 +- {peermgr => lib/peermgr}/peermgr.go | 0 {tracing => lib/tracing}/setup.go | 0 node/builder.go | 2 +- node/hello/hello.go | 2 +- node/modules/services.go | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename {peermgr => lib/peermgr}/peermgr.go (100%) rename {tracing => lib/tracing}/setup.go (100%) diff --git a/chain/blocksync/blocksync_client.go b/chain/blocksync/blocksync_client.go index 4b5fd2ddf..69cd5ec7c 100644 --- a/chain/blocksync/blocksync_client.go +++ b/chain/blocksync/blocksync_client.go @@ -22,8 +22,8 @@ import ( "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" incrt "github.com/filecoin-project/lotus/lib/increadtimeout" + "github.com/filecoin-project/lotus/lib/peermgr" "github.com/filecoin-project/lotus/node/modules/dtypes" - "github.com/filecoin-project/lotus/peermgr" ) type BlockSync struct { diff --git a/cmd/lotus-storage-miner/main.go b/cmd/lotus-storage-miner/main.go index ec91a7f4a..addcb9094 100644 --- a/cmd/lotus-storage-miner/main.go +++ b/cmd/lotus-storage-miner/main.go @@ -10,8 +10,8 @@ import ( "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/lib/lotuslog" + "github.com/filecoin-project/lotus/lib/tracing" "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/lotus/tracing" ) var log = logging.Logger("main") diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index a37843c6d..0bd9a305f 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -20,11 +20,11 @@ import ( "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/vm" + "github.com/filecoin-project/lotus/lib/peermgr" "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" - "github.com/filecoin-project/lotus/peermgr" ) const ( diff --git a/cmd/lotus/main.go b/cmd/lotus/main.go index e040d397e..da003fb1c 100644 --- a/cmd/lotus/main.go +++ b/cmd/lotus/main.go @@ -10,8 +10,8 @@ import ( "github.com/filecoin-project/lotus/build" lcli "github.com/filecoin-project/lotus/cli" "github.com/filecoin-project/lotus/lib/lotuslog" + "github.com/filecoin-project/lotus/lib/tracing" "github.com/filecoin-project/lotus/node/repo" - "github.com/filecoin-project/lotus/tracing" ) var AdvanceBlockCmd *cli.Command diff --git a/peermgr/peermgr.go b/lib/peermgr/peermgr.go similarity index 100% rename from peermgr/peermgr.go rename to lib/peermgr/peermgr.go diff --git a/tracing/setup.go b/lib/tracing/setup.go similarity index 100% rename from tracing/setup.go rename to lib/tracing/setup.go diff --git a/node/builder.go b/node/builder.go index 8d3d845bb..22e76dc66 100644 --- a/node/builder.go +++ b/node/builder.go @@ -38,6 +38,7 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/chain/wallet" + "github.com/filecoin-project/lotus/lib/peermgr" _ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/secp" "github.com/filecoin-project/lotus/markets/storageadapter" @@ -52,7 +53,6 @@ import ( "github.com/filecoin-project/lotus/node/modules/testing" "github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/paychmgr" - "github.com/filecoin-project/lotus/peermgr" "github.com/filecoin-project/lotus/storage" "github.com/filecoin-project/lotus/storage/sealing" "github.com/filecoin-project/lotus/storage/sectorblocks" diff --git a/node/hello/hello.go b/node/hello/hello.go index 93df738bf..c3276fb92 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/lotus/chain" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/peermgr" + "github.com/filecoin-project/lotus/lib/peermgr" ) const ProtocolID = "/fil/hello/1.0.0" diff --git a/node/modules/services.go b/node/modules/services.go index 33f2733b5..81b233289 100644 --- a/node/modules/services.go +++ b/node/modules/services.go @@ -15,10 +15,10 @@ import ( "github.com/filecoin-project/lotus/chain/blocksync" "github.com/filecoin-project/lotus/chain/messagepool" "github.com/filecoin-project/lotus/chain/sub" + "github.com/filecoin-project/lotus/lib/peermgr" "github.com/filecoin-project/lotus/node/hello" "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/helpers" - "github.com/filecoin-project/lotus/peermgr" ) func RunHello(mctx helpers.MetricsCtx, lc fx.Lifecycle, h host.Host, svc *hello.Service) {