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.

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

Cleanup after cortina merge, reduce diff with avax #371

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

evlekht
Copy link
Member

@evlekht evlekht commented Aug 1, 2024

This and chain4travel/caminoethvm#111 are cleanup PRs after cortina merges.
It removes empty-line diff with avax, unnecessary c4t headers, adds missing c4t headers and also adds missing camino prefixes to filenames.
It also removes some old leftovers that made it into dev by accident.

Additional references

Original PR based on cortina-15 dev
#347

@evlekht evlekht force-pushed the dev-c0/cortina-cleanup branch from 6ce5aad to f6f9c02 Compare August 1, 2024 15:51
@evlekht evlekht changed the title Dev c0/cortina cleanup Cleanup after cortina merge, reduce diff with avax Aug 2, 2024
@evlekht evlekht force-pushed the dev-c0/cortina-cleanup branch from f6f9c02 to e930456 Compare August 2, 2024 16:08
@mo-c4t
Copy link
Member

mo-c4t commented Aug 5, 2024

These files were changed also in the original PR:
api/server/server.go
genesis/bootstrappers_test.go
tests/e2e/p/staking_rewards.go
version/strings.go
vms/platformvm/txs/executor/staker_tx_verification_helpers.go

Noctunus
Noctunus previously approved these changes Aug 5, 2024
@evlekht
Copy link
Member Author

evlekht commented Aug 6, 2024

These files were changed also in the original PR: api/server/server.go genesis/bootstrappers_test.go tests/e2e/p/staking_rewards.go version/strings.go vms/platformvm/txs/executor/staker_tx_verification_helpers.go

api/server/server.go contains our old CORS code, that was removed during other cortinas merges. Since we decided that we don't need it (remember caminojs error log thingy), we can also removed that code now.
WDYT, @Noctunus @mo-c4t ?

@evlekht
Copy link
Member Author

evlekht commented Aug 6, 2024

These files were changed also in the original PR: api/server/server.go genesis/bootstrappers_test.go tests/e2e/p/staking_rewards.go version/strings.go vms/platformvm/txs/executor/staker_tx_verification_helpers.go

genesis/bootstrappers_test.go, tests/e2e/p/staking_rewards.go, vms/platformvm/txs/executor/staker_tx_verification_helpers.go will be added in later cortinas. There is no such file now.

@evlekht
Copy link
Member Author

evlekht commented Aug 6, 2024

These files were changed also in the original PR: api/server/server.go genesis/bootstrappers_test.go tests/e2e/p/staking_rewards.go version/strings.go vms/platformvm/txs/executor/staker_tx_verification_helpers.go

version/string.go in cortina-15 dev was reverted after cleanup because of CNR version-reading regexp.

@mo-c4t
Copy link
Member

mo-c4t commented Aug 6, 2024

These files were changed also in the original PR: api/server/server.go genesis/bootstrappers_test.go tests/e2e/p/staking_rewards.go version/strings.go vms/platformvm/txs/executor/staker_tx_verification_helpers.go

api/server/server.go contains our old CORS code, that was removed during other cortinas merges. Since we decided that we don't need it (remember caminojs error log thingy), we can also removed that code now. WDYT, @Noctunus @mo-c4t ?

We don't need it if the fix from avax is there. because before cortina wildcard * couldn't be used. but avax introduced a fix for that, I don't know in which cortina that fix is.

@evlekht evlekht force-pushed the dev-c0/cortina-cleanup branch from e930456 to af328f7 Compare August 7, 2024 10:48
mo-c4t
mo-c4t previously approved these changes Aug 7, 2024
@evlekht evlekht force-pushed the dev-c0/cortina-cleanup branch from af328f7 to 6a8e750 Compare August 7, 2024 12:59
@evlekht evlekht changed the base branch from dev-c0/base to dev August 7, 2024 12:59
@evlekht evlekht dismissed stale reviews from mo-c4t and Noctunus August 7, 2024 12:59

The base branch was changed.

@evlekht evlekht marked this pull request as ready for review August 7, 2024 12:59
@evlekht evlekht merged commit 05022a8 into dev Aug 7, 2024
@evlekht evlekht deleted the dev-c0/cortina-cleanup branch August 7, 2024 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants