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

Show file tree
Hide file tree
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 5a57e315c96b3776ac2bed88cb9ac0599119d9ad
8 changes: 1 addition & 7 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ const (
chainUpgradeFileName = "upgrade"
subnetConfigFileExt = ".json"

keystoreDeprecationMsg = "keystore API is deprecated"
peerListPushGossipDeprecationMsg = "push-based peer list gossip is deprecated"
keystoreDeprecationMsg = "keystore API is deprecated"
)

var (
Expand All @@ -64,11 +63,6 @@ var (
deprecatedKeys = map[string]string{
KeystoreAPIEnabledKey: keystoreDeprecationMsg,

NetworkPeerListValidatorGossipSizeKey: peerListPushGossipDeprecationMsg,
NetworkPeerListNonValidatorGossipSizeKey: peerListPushGossipDeprecationMsg,
NetworkPeerListPeersGossipSizeKey: peerListPushGossipDeprecationMsg,
NetworkPeerListGossipFreqKey: peerListPushGossipDeprecationMsg,

SnowRogueCommitThresholdKey: commitThresholdDeprecationMsg,
SnowVirtuousCommitThresholdKey: commitThresholdDeprecationMsg,
}
Expand Down
4 changes: 4 additions & 0 deletions snow/engine/snowman/transitive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
return nil
}

<<<<<<< HEAD

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (self-hosted, linux, ARM64, focal) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (self-hosted, linux, ARM64, focal) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (self-hosted, linux, ARM64, jammy) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (self-hosted, linux, ARM64, jammy) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Upgrade 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / e2e_existing_network 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / e2e 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-20.04) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-20.04) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-22.04) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-22.04) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (windows-2022) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (windows-2022) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (macos-12) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Unit (macos-12) 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Fuzz 

syntax error: unexpected <<, expected }

Check failure on line 164 in snow/engine/snowman/transitive.go

View workflow job for this annotation

GitHub Actions / Fuzz 

syntax error: unexpected <<, expected }
t.Ctx.Log.Verbo("sampling from validators",
zap.Stringer("validators", t.Validators),
)
Expand All @@ -176,6 +177,9 @@
}

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
You are viewing a condensed version of this merge commit. You can view the full changes here.