Cleanup after aggregator_v2_api and concurrent token features

igor-aptos commented 3 weeks ago

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

trunk-io[bot] commented 3 weeks ago

⏱️ 25h 19m total CI duration on this PR

| Job | Cumulative Duration | Recent Runs | |---|---|---| | [rust-targeted-unit-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112475428) | 2h 10m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288163/job/25071106297) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118627138/job/25072185519) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825893/job/25086923692) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569951/job/25111083603) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112475428) (+1 more) | | [test-replay / replay-verify (8)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103613) | 2h | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103613) | | [test-replay / replay-verify (10)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104120) | 2h | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104120) | | [test-replay / replay-verify (16)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105344) | 2h | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105344) | | [test-replay / replay-verify (17)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105588) | 2h | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105588) | | [test-replay / replay-verify (9)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103801) | 2h | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103801) | | [rust-move-unit-coverage](https://github.com/aptos-labs/aptos-core/actions/runs/9132020172/job/25112463869) | 1h 47m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288146/job/25071092654) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627142/job/25072174116) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825891/job/25086915685) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569957/job/25111073692) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020172/job/25112463869) (+1 more) | | [test-replay / replay-verify (6)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103143) | 1h 19m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103143) | | [test-replay / replay-verify (0)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071101645) | 1h 15m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071101645) | | [test-replay / replay-verify (13)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104729) | 1h 11m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104729) | | [rust-move-tests](https://github.com/aptos-labs/aptos-core/actions/runs/9132020168/job/25112463585) | 1h 10m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288155/job/25071092514) [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118627139/job/25072173989) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825892/job/25086915748) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569963/job/25111073870) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020168/job/25112463585) (+1 more) | | [test-replay / replay-verify (2)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102155) | 1h 5m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102155) | | [test-replay / replay-verify (4)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102653) | 55m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102653) | | [test-replay / replay-verify (5)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102897) | 54m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102897) | | [test-replay / replay-verify (7)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103391) | 47m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071103391) | | [test-replay / replay-verify (3)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102405) | 45m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071102405) | | [rust-lints](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112475204) | 36m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288163/job/25071105488) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627138/job/25072185339) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825893/job/25086923501) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569951/job/25111083413) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112475204) (+1 more) | | [run-tests-main-branch](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112478500) | 25m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288152/job/25071109095) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627064/job/25072193876) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825709/job/25086927708) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569869/job/25111087421) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112478500) (+1 more) | | [general-lints](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112474938) | 11m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288163/job/25071105700) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627138/job/25072185753) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825893/job/25086923835) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569951/job/25111083190) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112474938) (+1 more) | | [check-dynamic-deps](https://github.com/aptos-labs/aptos-core/actions/runs/9132020169/job/25112463032) | 7m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288153/job/25071091979) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627145/job/25072172855) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825894/job/25086915386) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569960/job/25111073287) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020169/job/25112463032) (+1 more) | | [test-replay / replay-verify (14)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104956) | 7m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104956) | | [test-replay / replay-verify (1)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071101896) | 7m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071101896) | | [test-replay / replay-verify (11)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104303) | 7m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104303) | | [test-replay / replay-verify (12)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104501) | 7m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071104501) | | [test-replay / replay-verify (15)](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105170) | 6m | [🟥](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071105170) | | [semgrep/ci](https://github.com/aptos-labs/aptos-core/actions/runs/9132020154/job/25112462894) | 2m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288161/job/25071091818) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627137/job/25072172918) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825900/job/25086915195) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569958/job/25111073215) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020154/job/25112462894) (+1 more) | | [update](https://github.com/aptos-labs/aptos-core/actions/runs/9118288148/job/25071091708) | 1m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288148/job/25071091708) | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112468378) | 1m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288152/job/25071098645) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627064/job/25072182388) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825709/job/25086920120) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569869/job/25111077957) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112468378) (+1 more) | | [file_change_determinator](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112463843) | 1m | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288163/job/25071092956) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627138/job/25072173793) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825893/job/25086915830) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569951/job/25111073762) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132020161/job/25112463843) (+1 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9132019944/job/25112462323) | 19s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288145/job/25071092149) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627054/job/25072172517) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825701/job/25086914581) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569868/job/25111072791) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019944/job/25112462323) (+1 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112462634) | 18s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288152/job/25071092917) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627064/job/25072172804) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825709/job/25086914955) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569869/job/25111073130) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019948/job/25112462634) (+1 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9132019945/job/25112462517) | 18s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288141/job/25071092440) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627060/job/25072173080) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825700/job/25086914800) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569866/job/25111073045) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019945/job/25112462517) (+1 more) | | [permission-check](https://github.com/aptos-labs/aptos-core/actions/runs/9132019960/job/25112462299) | 16s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288138/job/25071091973) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118627070/job/25072172433) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9123825703/job/25086914619) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9131569865/job/25111072758) [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9132019960/job/25112462299) (+1 more) | | [determine-test-metadata](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071092909) | 6s | [🟩](https://github.com/aptos-labs/aptos-core/actions/runs/9118288157/job/25071092909) |

_{settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io}

codecov[bot] commented 3 weeks ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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

Additional details and impacted files

```diff @@ 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 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

igor-aptos commented 2 weeks ago

addressed comments, ping to other reviewers

aptos-labs / aptos-core