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 aggregator_v2_api and concurrent token features #13247

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

igor-aptos
Copy link
Contributor

Those two features will not be reverted.
If there is any issue with the aggregators, feature that controls the fallback will be used, but API will still work.

This simplifies the complicated nested if conditions in collection.move and token.move

Description

Type of Change

  • New feature
  • Bug fix
  • Breaking change
  • Performance improvement
  • Refactoring
  • Dependency update
  • Documentation update
  • Tests

Which Components or Systems Does This Change Impact?

  • Validator Node
  • Full Node (API, Indexer, etc.)
  • Move/Aptos Virtual Machine
  • Aptos Framework
  • Aptos CLI/SDK
  • Developer Infrastructure
  • Other (specify)

How Has This Been Tested?

Key Areas to Review

Checklist

  • I have read and followed the CONTRIBUTING doc
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I identified and added all stakeholders and component owners affected by this change as reviewers
  • I tested both happy and unhappy path of the functionality
  • I have made corresponding changes to the documentation

Copy link

trunk-io bot commented May 10, 2024

⏱️ 25h 19m total CI duration on this PR
Job Cumulative Duration Recent Runs
rust-targeted-unit-tests 2h 10m 🟥🟥🟩🟩🟩 (+1 more)
test-replay / replay-verify (8) 2h 🟥
test-replay / replay-verify (10) 2h 🟥
test-replay / replay-verify (16) 2h 🟥
test-replay / replay-verify (17) 2h 🟥
test-replay / replay-verify (9) 2h 🟥
rust-move-unit-coverage 1h 47m 🟩🟩🟩🟩🟩 (+1 more)
test-replay / replay-verify (6) 1h 19m 🟩
test-replay / replay-verify (0) 1h 15m 🟩
test-replay / replay-verify (13) 1h 11m 🟩
rust-move-tests 1h 10m 🟥🟥🟩🟩🟩 (+1 more)
test-replay / replay-verify (2) 1h 5m 🟩
test-replay / replay-verify (4) 55m 🟩
test-replay / replay-verify (5) 54m 🟩
test-replay / replay-verify (7) 47m 🟩
test-replay / replay-verify (3) 45m 🟩
rust-lints 36m 🟩🟩🟩🟩🟩 (+1 more)
run-tests-main-branch 25m 🟩🟩🟩🟩🟩 (+1 more)
general-lints 11m 🟩🟩🟩🟩🟩 (+1 more)
check-dynamic-deps 7m 🟩🟩🟩🟩🟩 (+1 more)
test-replay / replay-verify (14) 7m 🟥
test-replay / replay-verify (1) 7m 🟥
test-replay / replay-verify (11) 7m 🟥
test-replay / replay-verify (12) 7m 🟥
test-replay / replay-verify (15) 6m 🟥
semgrep/ci 2m 🟩🟩🟩🟩🟩 (+1 more)
update 1m 🟩
file_change_determinator 1m 🟩🟩🟩🟩🟩 (+1 more)
file_change_determinator 1m 🟩🟩🟩🟩🟩 (+1 more)
permission-check 19s 🟩🟩🟩🟩🟩 (+1 more)
permission-check 18s 🟩🟩🟩🟩🟩 (+1 more)
permission-check 18s 🟩🟩🟩🟩🟩 (+1 more)
permission-check 16s 🟩🟩🟩🟩🟩 (+1 more)
determine-test-metadata 6s 🟩

settingsfeedbackdocs ⋅ learn more about trunk.io

Copy link

codecov bot commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 57.5%. Comparing base (8c6963d) to head (b889ad1).
Report is 10 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##             main   #13247     +/-   ##
=========================================
- Coverage    57.5%    57.5%   -0.1%     
=========================================
  Files         832      833      +1     
  Lines      198522   198662    +140     
=========================================
+ Hits       114269   114280     +11     
- Misses      84253    84382    +129     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Those two features will not be reverted.
If there is any issue with the aggregators, feature that controls the fallback will be used,
but API will still work.
@igor-aptos igor-aptos force-pushed the igor/deprecating_rolled_out_features branch from 59de22a to 26b579d Compare May 17, 2024 06:16
public fun get_auids(): u64 { APTOS_UNIQUE_IDENTIFIERS }
public fun get_auids(): u64 {
// Deployed to production, and disabling deprecated.
error::invalid_argument(EINVALID_FEATURE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably permission_denied or something like this would be better? With a new error code which is like EFEATURE_CANNOT_BE_DISABLED or something like that

public fun get_aggregator_v2_api_feature(): u64 { AGGREGATOR_V2_API }
public fun get_aggregator_v2_api_feature(): u64 {
// API fully rolled out, cannot be reverted any more
abort error::invalid_argument(EINVALID_FEATURE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

let feature = features::get_concurrent_token_v2_feature();
let agg_feature = features::get_aggregator_v2_api_feature();
let auid_feature = features::get_auids();
let module_event_feature = features::get_module_event_feature();
Copy link
Contributor

Choose a reason for hiding this comment

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

module event feature also cannot be reverted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it can be reverted, but default is true - so we don't need to enable it in this test.

though that can potentially also be cleaned up @lightmark

};

(index, name)
// If aggregator_api_enabled, we always populate newly added fields
Copy link
Contributor

Choose a reason for hiding this comment

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

The comment seems off? aggregator_api_enabled is always enabled

@igor-aptos
Copy link
Contributor Author

addressed comments, ping to other reviewers

@igor-aptos igor-aptos force-pushed the igor/deprecating_rolled_out_features branch from 45f0ee3 to b889ad1 Compare May 17, 2024 17:28
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.

None yet

3 participants