coosld/ceremonyclient
1
0
Fork 0
mirror of https://github.com/QuilibriumNetwork/ceremonyclient.git synced 2026-02-21 10:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve non-fallthrough condition that should be fallthrough

Browse Source
This commit is contained in:
Cassandra Heart 2026-02-18 19:53:36 -06:00
parent b700621773
commit db4efe35cd
No known key found for this signature in database
GPG Key ID: 371083BFA6C240AA
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
node/consensus/global/global_consensus_engine.go
View File

@ -3360,7 +3360,10 @@ func (e *GlobalConsensusEngine) ProposeWorkerJoin(
mergeSeniority = mergeSeniorityBI.Uint64()
}
// If prover already exists, check if we should submit a seniority merge
// If prover already exists, submit a seniority merge if needed, then
// fall through to the join — the filters being proposed are only for
// unallocated shards (already filtered by collectAllocationSnapshot),
// so the join is valid even when the prover has existing allocations.
if proverExists {
if mergeSeniority > info.Seniority {
e.logger.Info(
@ -3369,14 +3372,16 @@ func (e *GlobalConsensusEngine) ProposeWorkerJoin(
zap.Uint64("merge_seniority", mergeSeniority),
zap.Strings("peer_ids", peerIds),
)
return e.submitSeniorityMerge(frame, helpers, mergeSeniority, peerIds)
if mergeErr := e.submitSeniorityMerge(frame, helpers, mergeSeniority, peerIds); mergeErr != nil {
e.logger.Warn("failed to submit seniority merge", zap.Error(mergeErr))
}
}
e.logger.Debug(
"prover already exists with sufficient seniority, skipping join",
zap.Uint64("existing_seniority", info.Seniority),
zap.Uint64("merge_seniority", mergeSeniority),
)
return nil
// Clear merge targets for the join — Materialize only applies
// seniority from merge targets when creating a new prover vertex.
// Including them here would just consume the spent markers without
// updating seniority, racing with the separate seniority merge.
helpers = nil
peerIds = nil
}
e.logger.Info(
@ -3487,20 +3492,6 @@ func (e *GlobalConsensusEngine) ProposeWorkerJoin(
return errors.Wrap(err, "propose worker join")
}
// Full self-verification: run the same validation that archive/proposer
// nodes execute so we catch any issue locally before publishing.
if valid, verifyErr := join.Verify(frame.Header.FrameNumber); !valid || verifyErr != nil {
e.logger.Error(
"join self-verification failed, not publishing",
zap.Bool("valid", valid),
zap.Error(verifyErr),
)
return errors.Wrap(
fmt.Errorf("self-verify failed: valid=%v, err=%v", valid, verifyErr),
"propose worker join",
)
}
bundle := &protobufs.MessageBundle{
Requests: []*protobufs.MessageRequest{
{