p2pv1: change dynamic-nodes connections to static-node connections in static-node mode. #230
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
icexin
reviewed
Aug 20, 2021
| peersChan := make(chan []*pb.PeerInfo, len(addresses)) | ||
| done := make(chan struct{}) | ||
|
|
||
| for _, addr := range addresses { |
There was a problem hiding this comment.
用sync.Mutex来保护remotePeers，直接在闭包里面append remotePeers，可以不用channel来交互
bcs/network/p2pv1/conn.go
Outdated
| ctx: ctx, | ||
| }, nil | ||
| } | ||
| cp.staticModeOn = len(ctx.P2PConf.BootNodes) == 0 && len(ctx.P2PConf.StaticNodes) > 0 |
There was a problem hiding this comment.
避免一行里面有复杂逻辑，改成
if len(ctx.P2PConf.BootNodes) == 0 && len(ctx.P2PConf.StaticNodes) > 0 {
cp.staticModeOn = true
}
bcs/network/p2pv1/client.go
Outdated
| @@ -202,6 +202,31 @@ func (p *P2PServerV1) GetPeerIdByAccount(account string) (string, error) { | |||
| if value, ok := p.accounts.Get(account); ok { | |||
| return value.(string), nil | |||
| } | |||
|
|
|||
| // xchain address can not mapping, try getPeerInfo again. | |||
| if p.pool.staticModeOn && len(p.accounts.Items()) != 0 { | |||
There was a problem hiding this comment.
用提前返回错误的方式来处理这种场景，避免深度嵌套if语句，这里可以改成
if !p.pool.staticModeOn {
return "", ErrAccountNotExist
}另外accounts.Items为空判断有逻辑错误，不用判断。
icexin
approved these changes
Aug 20, 2021
Codecov Report
@@ Coverage Diff @@
## master #230 +/- ##
==========================================
+ Coverage 47.33% 47.51% +0.18%
==========================================
Files 133 133
Lines 11411 11455 +44
==========================================
+ Hits 5401 5443 +42
Misses 4876 4876
- Partials 1134 1136 +2
Continue to review full report at Codecov.
|
aucusaga
changed the title
godeamon
approved these changes
Aug 20, 2021
chenfengjin
pushed a commit
to chenfengjin/xupercore
that referenced
this pull request
Sep 24, 2021
chenfengjin
pushed a commit
to chenfengjin/xupercore
that referenced
this pull request
Sep 26, 2021
1 task
vantinfy
pushed a commit
to superconsensus/matrixcore
that referenced
this pull request
Jan 26, 2022
… static-node mode. (OpenAtomFoundation#230) (cherry picked from commit 4a9d712)
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.
Description
Add router in static-node mode.
Fixes # (issue)
Type of change
Brief of your solution
Nodes can refresh their router info by the function GetPeerInfo.
How Has This Been Tested?
Use testnet and xfront.