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 put gossip #2790

Merged
merged 6 commits into from
Mar 6, 2024
Merged

Remove put gossip #2790

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8972408
Remove put gossip
StephenButtolph Feb 29, 2024
3c98354
mockgen
StephenButtolph Mar 1, 2024
210dcbd
nit
StephenButtolph Mar 1, 2024
5a57e31
merged
StephenButtolph Mar 6, 2024
68de05c
merged
StephenButtolph Mar 6, 2024
08d477d
nit
StephenButtolph Mar 6, 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
merged
  • Loading branch information
@StephenButtolph
StephenButtolph committed Mar 6, 2024
commit 68de05c0dd08b353e53861a573d13160996ebd58
4 changes: 0 additions & 4 deletions snow/engine/snowman/transitive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ func (t *Transitive) Gossip(ctx context.Context) error {
return nil
}

<<<<<<< HEAD
t.Ctx.Log.Verbo("sampling from validators",
zap.Stringer("validators", t.Validators),
)
Expand All @@ -177,9 +176,6 @@ func (t *Transitive) Gossip(ctx context.Context) error {
}

nextHeightToAccept, err := math.Add64(lastAcceptedHeight, 1)
=======
lastAccepted, err := t.getBlock(ctx, lastAcceptedID)
>>>>>>> master
if err != nil {
t.Ctx.Log.Error("skipping block gossip",
zap.String("reason", "block height overflow"),
Expand Down
Loading