Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove internal partners from root block creation #6472

Merged
merged 4 commits into from
Sep 19, 2024
Merged

Remove internal partners from root block creation #6472

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift click to select a range
23d1cdf
remove internal partners from root block creation
zhangchiqing Sep 17, 2024
e87b027
print nodeID when missing partner info
zhangchiqing Sep 17, 2024
5ce965a
include mismatch number in error message
zhangchiqing Sep 18, 2024
ceb3ee2
Apply suggestions from code review
zhangchiqing Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
print nodeID when missing partner info
  • Loading branch information
@zhangchiqing
zhangchiqing committed Sep 19, 2024
commit e87b027582805f8d3ff25260d69d51143bd514c9
4 changes: 2 additions & 2 deletions cmd/util/cmd/common/node_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 50,7 @@ func ReadFullPartnerNodeInfos(log zerolog.Logger, partnerWeightsPath, partnerNod

weight := weights[partner.NodeID]
if valid := ValidateWeight(weight); !valid {
return nil, fmt.Errorf(fmt.Sprintf("invalid partner weight: %d", weight))
return nil, fmt.Errorf(fmt.Sprintf("invalid partner weight %v: %d", partner.NodeID, weight))
}

if weight != flow.DefaultInitialWeight {
Expand Down Expand Up @@ -148,7 148,7 @@ func ReadFullInternalNodeInfos(log zerolog.Logger, internalNodePrivInfoDir, inte
weight := weights[internal.Address]

if valid := ValidateWeight(weight); !valid {
return nil, fmt.Errorf(fmt.Sprintf("invalid partner weight: %d", weight))
return nil, fmt.Errorf(fmt.Sprintf("invalid partner weight %v: %d", internal.NodeID, weight))
}
if weight != flow.DefaultInitialWeight {
log.Warn().Msgf("internal node (id=%x) has non-default weight (%d != %d)", internal.NodeID, weight, flow.DefaultInitialWeight)
Expand Down