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

[token] fix the duplicated error code #5804

Merged
merged 1 commit into from
Dec 11, 2022
Merged

[token] fix the duplicated error code #5804

merged 1 commit into from
Dec 11, 2022

Conversation

areshand
Copy link
Contributor

@areshand areshand commented Dec 7, 2022

Description

fix the duplicated the error code

Test Plan

@areshand areshand force-pushed the fix_duplicated_error_code branch from b17cd68 to f3e62a2 Compare December 7, 2022 19:40
davidiw
davidiw reviewed Dec 9, 2022
View reviewed changes
aptos-move/framework/aptos-token/sources/token.move
@@ -118,36 +118,36 @@ module aptos_token::token {
const ENO_BURN_TOKEN_WITH_ZERO_AMOUNT: u64 = 29;

/// Withdraw proof expires
const EWITHDRAW_PROOF_EXPIRES: u64 = 29;
Copy link
Contributor

Choose a reason for hiding this comment

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

let's make this 39 and leave the rest alone?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

@davidiw
Copy link
Contributor

davidiw commented Dec 9, 2022

Considering that each shift could break someone's integration, I'd really prefer we not shift every error.

@areshand areshand force-pushed the fix_duplicated_error_code branch 2 times, most recently from ca203a2 to e78f59e Compare December 9, 2022 04:27
@areshand areshand requested a review from davidiw December 9, 2022 04:27
@davidiw davidiw force-pushed the fix_duplicated_error_code branch from e78f59e to 71a7b8c Compare December 11, 2022 03:58
@davidiw davidiw enabled auto-merge (squash) December 11, 2022 03:58
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions
Copy link
Contributor

✅ Forge suite land_blocking success on 71a7b8c4c3c527d75702286a43595f410479ee9f

performance benchmark with full nodes : 6371 TPS, 6237 ms latency, 8700 ms p99 latency,no expired txns
Test Ok

@github-actions
Copy link
Contributor

✅ Forge suite compat success on testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 71a7b8c4c3c527d75702286a43595f410479ee9f

Compatibility test results for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 71a7b8c4c3c527d75702286a43595f410479ee9f (PR)
1. Check liveness of validators at old version: testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b
compatibility::simple-validator-upgrade::liveness-check : 7212 TPS, 5339 ms latency, 7200 ms p99 latency,no expired txns
2. Upgrading first Validator to new version: 71a7b8c4c3c527d75702286a43595f410479ee9f
compatibility::simple-validator-upgrade::single-validator-upgrade : 4324 TPS, 9406 ms latency, 12800 ms p99 latency,no expired txns
3. Upgrading rest of first batch to new version: 71a7b8c4c3c527d75702286a43595f410479ee9f
compatibility::simple-validator-upgrade::half-validator-upgrade : 4692 TPS, 8617 ms latency, 11900 ms p99 latency,no expired txns
4. upgrading second batch to new version: 71a7b8c4c3c527d75702286a43595f410479ee9f
compatibility::simple-validator-upgrade::rest-validator-upgrade : 6372 TPS, 6162 ms latency, 12200 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 71a7b8c4c3c527d75702286a43595f410479ee9f passed
Test Ok

@davidiw davidiw merged commit 3c637b4 into aptos-labs:main Dec 11, 2022
areshand added a commit to areshand/aptos-core-1 that referenced this pull request Dec 16, 2022
@areshand
[token] fix the duplicated error code (aptos-labs#5804)
613a227
areshand added a commit to areshand/aptos-core-1 that referenced this pull request Dec 18, 2022
@areshand
[token] fix the duplicated error code (aptos-labs#5804)
5d1a783
movekevin pushed a commit that referenced this pull request Dec 19, 2022
@areshand @movekevin
[token] fix the duplicated error code (#5804)
73baf93
@Markuze Markuze mentioned this pull request Dec 26, 2022
Closed
@Markuze Markuze mentioned this pull request Jan 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidiw davidiw davidiw approved these changes

@movekevin movekevin movekevin approved these changes

@wrwg wrwg Awaiting requested review from wrwg

@0xchloe 0xchloe Awaiting requested review from 0xchloe

@lightmark lightmark Awaiting requested review from lightmark

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

Successfully merging this pull request may close these issues.
3 participants
@areshand @davidiw @movekevin