From 25a77d905ddff989083457499957705510af54fb Mon Sep 17 00:00:00 2001 From: Peter Rabbitson Date: Tue, 6 Apr 2021 15:04:32 +0200 Subject: [PATCH] Centralize everything on ipfs/go-log/v2 I am not entirely sure this is right, but everything seems to build... --- chain/beacon/beacon.go | 2 +- chain/beacon/drand/drand.go | 2 +- chain/exchange/protocol.go | 2 +- chain/market/fundmanager.go | 2 +- chain/messagepool/selection_test.go | 2 +- chain/stmgr/forks_test.go | 2 +- chain/wallet/ledger/ledger.go | 2 +- cmd/lotus-gateway/main.go | 2 +- cmd/lotus-health/main.go | 2 +- cmd/lotus-shed/datastore.go | 2 +- cmd/lotus-shed/mempool-stats.go | 2 +- extern/sector-storage/ffiwrapper/sealer_test.go | 2 +- extern/sector-storage/manager_test.go | 2 +- extern/sector-storage/mock/mock.go | 2 +- go.mod | 1 - journal/types.go | 2 +- lib/ulimit/ulimit.go | 2 +- node/builder.go | 2 +- node/impl/full/chain.go | 2 +- 19 files changed, 18 insertions(+), 19 deletions(-) diff --git a/chain/beacon/beacon.go b/chain/beacon/beacon.go index 9543bec54..220057282 100644 --- a/chain/beacon/beacon.go +++ b/chain/beacon/beacon.go @@ -4,7 +4,7 @@ import ( "context" "github.com/filecoin-project/go-state-types/abi" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/build" diff --git a/chain/beacon/drand/drand.go b/chain/beacon/drand/drand.go index 4abc12d29..cb08b6af9 100644 --- a/chain/beacon/drand/drand.go +++ b/chain/beacon/drand/drand.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap/zapcore" "golang.org/x/xerrors" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/filecoin-project/go-state-types/abi" diff --git a/chain/exchange/protocol.go b/chain/exchange/protocol.go index 211479335..d0977e54c 100644 --- a/chain/exchange/protocol.go +++ b/chain/exchange/protocol.go @@ -7,7 +7,7 @@ import ( "github.com/filecoin-project/lotus/chain/store" "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/market/fundmanager.go b/chain/market/fundmanager.go index e3f10fdec..8d5f63ce2 100644 --- a/chain/market/fundmanager.go +++ b/chain/market/fundmanager.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "go.uber.org/fx" "golang.org/x/xerrors" ) diff --git a/chain/messagepool/selection_test.go b/chain/messagepool/selection_test.go index c61e24fcf..e32d897c4 100644 --- a/chain/messagepool/selection_test.go +++ b/chain/messagepool/selection_test.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" diff --git a/chain/stmgr/forks_test.go b/chain/stmgr/forks_test.go index e456dc436..fe96ad610 100644 --- a/chain/stmgr/forks_test.go +++ b/chain/stmgr/forks_test.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-cid" ipldcbor "github.com/ipfs/go-ipld-cbor" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" diff --git a/chain/wallet/ledger/ledger.go b/chain/wallet/ledger/ledger.go index 1b0bf1a04..eb16f6460 100644 --- a/chain/wallet/ledger/ledger.go +++ b/chain/wallet/ledger/ledger.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" ledgerfil "github.com/whyrusleeping/ledger-filecoin-go" "golang.org/x/xerrors" diff --git a/cmd/lotus-gateway/main.go b/cmd/lotus-gateway/main.go index 23b743d73..cbb143930 100644 --- a/cmd/lotus-gateway/main.go +++ b/cmd/lotus-gateway/main.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/lotus/lib/lotuslog" "github.com/filecoin-project/lotus/metrics" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "go.opencensus.io/stats/view" "github.com/gorilla/mux" diff --git a/cmd/lotus-health/main.go b/cmd/lotus-health/main.go index e8a32a719..a766c0868 100644 --- a/cmd/lotus-health/main.go +++ b/cmd/lotus-health/main.go @@ -9,7 +9,7 @@ import ( "time" cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/urfave/cli/v2" "github.com/filecoin-project/go-jsonrpc" diff --git a/cmd/lotus-shed/datastore.go b/cmd/lotus-shed/datastore.go index 4533b78a9..c3a9e572c 100644 --- a/cmd/lotus-shed/datastore.go +++ b/cmd/lotus-shed/datastore.go @@ -13,7 +13,7 @@ import ( "github.com/docker/go-units" "github.com/ipfs/go-datastore" dsq "github.com/ipfs/go-datastore/query" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/mitchellh/go-homedir" "github.com/polydawn/refmt/cbor" "github.com/urfave/cli/v2" diff --git a/cmd/lotus-shed/mempool-stats.go b/cmd/lotus-shed/mempool-stats.go index bc4a801f0..597ba0393 100644 --- a/cmd/lotus-shed/mempool-stats.go +++ b/cmd/lotus-shed/mempool-stats.go @@ -8,7 +8,7 @@ import ( "contrib.go.opencensus.io/exporter/prometheus" "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/urfave/cli/v2" "go.opencensus.io/stats" "go.opencensus.io/stats/view" diff --git a/extern/sector-storage/ffiwrapper/sealer_test.go b/extern/sector-storage/ffiwrapper/sealer_test.go index 3b379af6f..2efcfc6a0 100644 --- a/extern/sector-storage/ffiwrapper/sealer_test.go +++ b/extern/sector-storage/ffiwrapper/sealer_test.go @@ -21,7 +21,7 @@ import ( "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" "golang.org/x/xerrors" diff --git a/extern/sector-storage/manager_test.go b/extern/sector-storage/manager_test.go index e768d4516..1cf9d0aad 100644 --- a/extern/sector-storage/manager_test.go +++ b/extern/sector-storage/manager_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/uuid" "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-state-types/abi" diff --git a/extern/sector-storage/mock/mock.go b/extern/sector-storage/mock/mock.go index 17e969758..76f6dadaf 100644 --- a/extern/sector-storage/mock/mock.go +++ b/extern/sector-storage/mock/mock.go @@ -16,7 +16,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/specs-storage/storage" "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper" diff --git a/go.mod b/go.mod index f2d4b6a86..3a91713fb 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,6 @@ require ( github.com/ipfs/go-ipfs-util v0.0.2 github.com/ipfs/go-ipld-cbor v0.0.5 github.com/ipfs/go-ipld-format v0.2.0 - github.com/ipfs/go-log v1.0.4 github.com/ipfs/go-log/v2 v2.1.2-0.20200626104915-0016c0b4b3e4 github.com/ipfs/go-merkledag v0.3.2 github.com/ipfs/go-metrics-interface v0.0.1 diff --git a/journal/types.go b/journal/types.go index 5b51ed4c8..3e240a9f1 100644 --- a/journal/types.go +++ b/journal/types.go @@ -5,7 +5,7 @@ import ( "strings" "time" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("journal") diff --git a/lib/ulimit/ulimit.go b/lib/ulimit/ulimit.go index f9999cf68..16bd4c9c1 100644 --- a/lib/ulimit/ulimit.go +++ b/lib/ulimit/ulimit.go @@ -8,7 +8,7 @@ import ( "strconv" "syscall" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" ) var log = logging.Logger("ulimit") diff --git a/node/builder.go b/node/builder.go index ad8d43d9e..f5dacab5e 100644 --- a/node/builder.go +++ b/node/builder.go @@ -18,7 +18,7 @@ import ( "github.com/filecoin-project/lotus/node/hello" "github.com/filecoin-project/lotus/system" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" ci "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" diff --git a/node/impl/full/chain.go b/node/impl/full/chain.go index 25d366a87..c45932195 100644 --- a/node/impl/full/chain.go +++ b/node/impl/full/chain.go @@ -18,7 +18,7 @@ import ( offline "github.com/ipfs/go-ipfs-exchange-offline" cbor "github.com/ipfs/go-ipld-cbor" ipld "github.com/ipfs/go-ipld-format" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/ipfs/go-merkledag" "github.com/ipfs/go-path" "github.com/ipfs/go-path/resolver"