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

Jump to bottom

cmd, core: remove calaveras testnet #23366

Merged
merged 2 commits into from
Aug 17, 2021
Merged

cmd, core: remove calaveras testnet #23366

merged 2 commits into from
Aug 17, 2021

Conversation

Zachinquarantine
Copy link
Contributor

The Calaveras testnet has been shut down, because it was only a short lived testnet in the first place. This PR fully removes Calaveras.

@karalabe
Copy link
Member

The code doesn't compile.

@Zachinquarantine

This comment has been minimized.

Sign in to view
@Zachinquarantine

This comment has been minimized.

Sign in to view
@Zachinquarantine
Copy link
Contributor Author

I can't figure out how this is failing...

@Zachinquarantine
Copy link
Contributor Author

I can't figure out how this is failing...

I literally copied the failing code from master, which passed, and yet somehow on this branch it fails.

holiman
holiman reviewed Aug 11, 2021
View reviewed changes
core/state/snapshot/snapshot.go Outdated Show resolved Hide resolved
params/config.go Outdated Show resolved Hide resolved
Zachinquarantine and others added 2 commits August 12, 2021 09:19
@Zachinquarantine @holiman
parent 2a451f9
ee345f7 
author Zachinquarantine <[email protected]> 1628353228 -0400
committer Martin Holst Swende <[email protected]> 1628752707 +0200
gpgsig -----BEGIN PGP SIGNATURE-----

 iQFFBAABCAAvFiEEypmrtbNuJK1doP1AaDtDjAWl3fAFAmEUy0MRHG1hcnRpbkBz
 d2VuZGUuc2UACgkQaDtDjAWl3fBwKAf/e6SXUQGTvtjU8ISxMV24RwvnJiPd5kWU
 L+lOnPAsUaFGJePDOcWtJucqZ361zg7jiwP8zANDiJXjphYUs8AfoHwjGTeI5pDV
 utns1RH9kBU4iavioNrWDiXj1X+CDfRhY5P7itMbladVLJMqa3YkW4g9kIY3O01J
 q77enuLCaK0Fmp8E0pE+ggnMaPumkBhTyVQTcy8AWHHNZp/6dKFLIlKVGaXrSjLe
 SPJAmmFkKMbxBnLGYFSKck+LvGUfT4ReBGU4Vo+ULs39rhpJ4d8SBcUKOWbmSoPw
 gnqUdGsT2wysMImxEhU8UylsZwlwW1BM7R8P52Q2WT17q9nrXLLWFg==
 =Fviz
 -----END PGP SIGNATURE-----

remove calaveras flag

removes calaveras flag

Removes all instances of the Calaveras flags

delete calaveras

remove calaveras

remove calaveras

Remove calaveras

remove calaveras

fully remove calaveras

remove calaveras

fix/revert typo

removes stray mention of calaveras

and hopefully fixes some of the build errors!

(maybe) fixes the build error in config.go?

config.go error fix v2

fix build error

fix build error

fix again

params: fix build error

params: fix build error

params: fix build error
@holiman
params: go format
d2980d3
@holiman
Copy link
Contributor

holiman commented Aug 12, 2021

I literally copied the failing code from master, which passed, and yet somehow on this branch it fails.

Yeah, things become a bit screwy when one branches off a certain commit, and then merge the newer commits into your branch. We usually instead rebase the branch to be on top of master.

I've rebased this on top of master now, and squashed your commits, and added one commit on top to fix a remaining lint issue. If you want to push more commits, you'll need to git pull the branch, and in order to actually "accept" the rebased remote branch, you'll need to git reset --hard origin/Calaverasgobrr

holiman
holiman approved these changes Aug 12, 2021
View reviewed changes
Copy link
Contributor

@holiman holiman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@holiman holiman changed the title cmd, core: Remove calaveras testnet cmd, core: remove calaveras testnet Aug 12, 2021
@holiman holiman merged commit 85b9bdd into ethereum:master Aug 17, 2021
@holiman holiman added this to the 1.10.8 milestone Aug 17, 2021
@Zachinquarantine Zachinquarantine deleted the Calaverasgobrr branch August 17, 2021 16:53
sidhujag pushed a commit to sidhujag/go-ethereum that referenced this pull request Aug 18, 2021
@Zachinquarantine
cmd, core: remove calaveras testnet (ethereum#23366)
b10062a
atif-konasl pushed a commit to frozeman/pandora-execution-engine that referenced this pull request Oct 15, 2021
@Zachinquarantine @atif-konasl
cmd, core: remove calaveras testnet (ethereum#23366)
ceafefa 
Removes references to the short-lived Calaveras testnet
@ycyraum ycyraum mentioned this pull request Aug 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tooss367 tooss367 tooss367 approved these changes

@holiman holiman holiman approved these changes

@karalabe karalabe Awaiting requested review from karalabe karalabe is a code owner

@rjl493456442 rjl493456442 Awaiting requested review from rjl493456442 rjl493456442 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.10.8
Development

Successfully merging this pull request may close these issues.
4 participants
@Zachinquarantine @karalabe @holiman @tooss367