Skip to content

Commit 0e75016

Browse files
authored
Libp2p 0.22 upgrade (#837)
* chore(deps): upgrade to Lotus RC & libp2p v0.22 * chore(deps): update go to 1.18 * ci(circle): update circle to go 1.18 * style(imports): fix imports * fix(build): update ffi * fix(lint): fix deprecated strings.Title method * fix(mod): mod tidy
1 parent c9d91e6 commit 0e75016

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+456
-666
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ orbs:
55
executors:
66
golang:
77
docker:
8-
- image: cimg/go:1.17.11
8+
- image: cimg/go:1.18.6
99
resource_class: 2xlarge
1010
ubuntu:
1111
docker:

api/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/filecoin-project/lotus/chain/types"
1515
"github.com/google/uuid"
1616
"github.com/ipfs/go-cid"
17-
"github.com/libp2p/go-libp2p-core/peer"
17+
"github.com/libp2p/go-libp2p/core/peer"
1818
"github.com/multiformats/go-multihash"
1919
)
2020

api/docgen/docgen.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"github.com/google/uuid"
1818
"github.com/ipfs/go-cid"
1919
"github.com/ipfs/go-graphsync"
20-
"github.com/libp2p/go-libp2p-core/metrics"
21-
"github.com/libp2p/go-libp2p-core/network"
22-
"github.com/libp2p/go-libp2p-core/peer"
23-
"github.com/libp2p/go-libp2p-core/protocol"
2420
pubsub "github.com/libp2p/go-libp2p-pubsub"
21+
"github.com/libp2p/go-libp2p/core/metrics"
22+
"github.com/libp2p/go-libp2p/core/network"
23+
"github.com/libp2p/go-libp2p/core/peer"
24+
"github.com/libp2p/go-libp2p/core/protocol"
2525
"github.com/multiformats/go-multiaddr"
2626

2727
datatransfer "github.com/filecoin-project/go-data-transfer"
@@ -45,6 +45,8 @@ import (
4545
"github.com/filecoin-project/lotus/node/repo/imports"
4646
"github.com/filecoin-project/lotus/storage/sealer/sealtasks"
4747
"github.com/filecoin-project/lotus/storage/sealer/storiface"
48+
"golang.org/x/text/cases"
49+
"golang.org/x/text/language"
4850
)
4951

5052
var ExampleValues = map[reflect.Type]interface{}{
@@ -363,7 +365,7 @@ func exampleStruct(method string, t, parent reflect.Type) interface{} {
363365
if f.Type == parent {
364366
continue
365367
}
366-
if strings.Title(f.Name) == f.Name {
368+
if cases.Title(language.Und, cases.NoLower).String(f.Name) == f.Name {
367369
ns.Elem().Field(i).Set(reflect.ValueOf(ExampleValue(method, f.Type, t)))
368370
}
369371
}

api/net.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66

77
lotus_api "github.com/filecoin-project/lotus/api"
88
lotus_net "github.com/filecoin-project/lotus/node/impl/net"
9-
metrics "github.com/libp2p/go-libp2p-core/metrics"
10-
"github.com/libp2p/go-libp2p-core/network"
11-
"github.com/libp2p/go-libp2p-core/peer"
12-
"github.com/libp2p/go-libp2p-core/protocol"
9+
metrics "github.com/libp2p/go-libp2p/core/metrics"
10+
"github.com/libp2p/go-libp2p/core/network"
11+
"github.com/libp2p/go-libp2p/core/peer"
12+
"github.com/libp2p/go-libp2p/core/protocol"
1313
)
1414

1515
// MODIFYING THE API INTERFACE

api/proxy_gen.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/filecoin-project/go-state-types/abi"
1313
"github.com/ipfs/go-cid"
1414

15-
"github.com/libp2p/go-libp2p-core/peer"
1615
pubsub "github.com/libp2p/go-libp2p-pubsub"
16+
"github.com/libp2p/go-libp2p/core/peer"
1717
ma "github.com/multiformats/go-multiaddr"
1818
)
1919

build/params_shared_funcs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/filecoin-project/go-address"
55
"github.com/ipfs/go-cid"
66

7-
"github.com/libp2p/go-libp2p-core/protocol"
7+
"github.com/libp2p/go-libp2p/core/protocol"
88

99
"github.com/filecoin-project/boost/node/modules/dtypes"
1010
)

cli/node/node.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/filecoin-project/lotus/chain/types"
1717
"github.com/filecoin-project/lotus/chain/wallet"
1818
"github.com/libp2p/go-libp2p"
19-
"github.com/libp2p/go-libp2p-core/crypto"
20-
"github.com/libp2p/go-libp2p-core/host"
19+
"github.com/libp2p/go-libp2p/core/crypto"
20+
"github.com/libp2p/go-libp2p/core/host"
2121
"github.com/mitchellh/go-homedir"
2222
)
2323

client/deal.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/filecoin-project/lotus/api/v1api"
1313
"github.com/google/uuid"
1414
"github.com/libp2p/go-libp2p"
15-
"github.com/libp2p/go-libp2p-core/peer"
16-
"github.com/libp2p/go-libp2p-core/peerstore"
17-
"github.com/libp2p/go-libp2p-peerstore/pstoremem"
15+
"github.com/libp2p/go-libp2p/core/peer"
16+
"github.com/libp2p/go-libp2p/core/peerstore"
17+
"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
1818
)
1919

2020
// StorageClient starts storage deals with Boost over libp2p

cmd/boost/deal_cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
lcli "github.com/filecoin-project/lotus/cli"
2222
"github.com/google/uuid"
2323
"github.com/ipfs/go-cid"
24-
inet "github.com/libp2p/go-libp2p-core/network"
24+
inet "github.com/libp2p/go-libp2p/core/network"
2525
"github.com/urfave/cli/v2"
2626
)
2727

0 commit comments

Comments
 (0)