这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@wrwg
Copy link
Contributor

@wrwg wrwg commented Jul 17, 2022

Description

Upgrades our repo to the new Move conventions of lower-case module names.

  • Module names were hardcoded in the code about everywhere and in 1/2 dozen different ways.
  • TransactionBuilderGenerator did not work after the renaming, so deactivated it and for now checked in the hand-massaged builders from the previous version.

Test Plan

Existing tests.


This change is Reviewable

@wrwg wrwg changed the title Update move2 [move] Upgrade to new Move state part #2 Jul 18, 2022
@wrwg wrwg changed the title [move] Upgrade to new Move state part #2 [move] Upgrade to newest state of Move step #2 Jul 18, 2022
@wrwg wrwg force-pushed the update_move2 branch 3 times, most recently from 8110d62 to 5692f8e Compare July 19, 2022 01:18
@wrwg wrwg requested review from areshand, movekevin and vgao1996 July 19, 2022 01:22
@wrwg wrwg marked this pull request as ready for review July 19, 2022 01:23
Copy link
Collaborator

@zekun000 zekun000 left a comment

Choose a reason for hiding this comment

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

this is insane amount of work, only one thing I want to clarify before approve.

how do the new generated_txn_builder generated? do we manually copy the generated files from the target dir or?

@wrwg
Copy link
Contributor Author

wrwg commented Jul 19, 2022

this is insane amount of work, only one thing I want to clarify before approve.

how do the new generated_txn_builder generated? do we manually copy the generated files from the target dir or?

The transaction generator doesn't work any longer. At least it didn't when I tried at the beginning of the refactoring. For now its a copy of the generated code before this change, then updated by hand to new naming. We need to fix the builder but not as part of this PR.

currency_code_required: bool,
) {
SystemAddresses::assert_aptos_framework(account);
assert!(signer::address_of(account) == @aptos_framework, errors::requires_address(ENOT_APTOS_FRAMEWORK));
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not use system_addresses:: assert_aptos_framework ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Merge conflict resolution problem ... Resolved

@zekun000
Copy link
Collaborator

someone probably needs to prioritize fixing the transaction generator, otherwise whoever update the script functions needs to manually update

@wrwg wrwg force-pushed the update_move2 branch 2 times, most recently from 0ad2a8e to 13e3145 Compare July 19, 2022 02:51
@wrwg
Copy link
Contributor Author

wrwg commented Jul 19, 2022

someone probably needs to prioritize fixing the transaction generator, otherwise whoever update the script functions needs to manually update

Yes, I'll look. But likely we can live also until GTM with hand editing. @davidiw wants to get completely rid of the generator.

@wrwg wrwg added the CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR label Jul 19, 2022
@wrwg wrwg force-pushed the update_move2 branch 2 times, most recently from 703393f to e21788e Compare July 19, 2022 03:37
@wrwg wrwg force-pushed the update_move2 branch 2 times, most recently from d665dfb to 85ebdea Compare July 19, 2022 04:12
@github-actions
Copy link
Contributor

❌ Forge test failure

Forge is land-blocking

Forge test runner terminated

Comment on lines 220 to 222
for (k, v) in script_registry.iter() {
eprintln!("reg {}: {:?}", k, v);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

😭

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that code is not longer called, but better to remove this. Done.

@github-actions
Copy link
Contributor

❌ Forge test failure

Forge is land-blocking

Forge test runner terminated

@github-actions
Copy link
Contributor

❌ Forge test failure

Forge is land-blocking

Forge test runner terminated

@wrwg wrwg force-pushed the update_move2 branch 2 times, most recently from d183b8e to b1694dd Compare July 19, 2022 16:25
@wrwg wrwg merged commit 7343c64 into aptos-labs:main Jul 19, 2022
@wrwg wrwg deleted the update_move2 branch July 19, 2022 17:14
@github-actions
Copy link
Contributor

✅ Forge test success

Forge is land-blocking

all up : 5782 TPS, 2946 ms latency, 4750 ms p99 latency,no expired txns

hodlen pushed a commit to hodlen/aptos-core.fork that referenced this pull request Sep 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants