Update libp2p #1059
Merged
Update libp2p #1059
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yann-sjtu
force-pushed
the
update_libp2p
branch
7 times, most recently
from
ced1e4c to
6e56019
Compare
vipwzw
reviewed
Jun 23, 2021
types/types.go
Outdated
| @@ -18,7 +18,7 @@ import ( | |||
| "github.com/33cn/chain33/common/address" | |||
| "github.com/33cn/chain33/common/crypto" | |||
| log "github.com/33cn/chain33/common/log/log15" | |||
| "github.com/33cn/chain33/types/jsonpb" | |||
| "github.com/golang/protobuf/jsonpb" | |||
There was a problem hiding this comment.
我们的jsonpb 是自己修改过的，你对比一下原来的版本。
yann-sjtu
force-pushed
the
update_libp2p
branch
5 times, most recently
from
159d6c3 to
99ef95c
Compare
Codecov Report
@@ Coverage Diff @@
## master #1059 +/- ##
==========================================
- Coverage 60.86% 60.41% -0.46%
==========================================
Files 153 157 +4
Lines 19634 19810 +176
==========================================
+ Hits 11951 11968 +17
- Misses 5850 6015 +165
+ Partials 1833 1827 -6
Continue to review full report at Codecov.
|
yann-sjtu
force-pushed
the
update_libp2p
branch
4 times, most recently
from
06dc264 to
c520313
Compare
yann-sjtu
force-pushed
the
update_libp2p
branch
2 times, most recently
from
5c736fa to
d543630
Compare
vipwzw
reviewed
Jun 29, 2021
| // 因此此处对JoinData类型在判等时做一个特殊处理 | ||
| if jd, ok := row.Data.(*JoinData); ok { | ||
| if oldJd, ok2 := row.old.(*JoinData); ok2 && proto.Equal(jd.Left, oldJd.Left) && proto.Equal(jd.Right, oldJd.Right) { | ||
| return nil, nil |
There was a problem hiding this comment.
写法上可以更加对称一点：
jd, ok := row.Data.(*JoinData)
oldJd, ok2 := row.old.(*JoinData)
if ok && ok2 && proto.Equal(jd.Left, oldJd.Left) && proto.Equal(jd.Right, oldJd.Right) {
return nil, nil
}
vipwzw
approved these changes
Jun 29, 2021
|
🎉 This PR is included in version 1.66.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 1.66.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
升级libp2p版本，老版本偶现panic libp2p/go-libp2p#1108
Fixes #1000