Skip to content

Commit aaaaf8a

Browse files
authored
[Framework] Refactor account module (#1389)
* draft refactor account * reslove the problem of circular dependencies * refactor account module and unitests * fixup examples and framework tests * fixup example and sdk testcases
1 parent f74212f commit aaaaf8a

File tree

104 files changed

+1852
-1701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1852
-1701
lines changed

crates/rooch-framework-tests/tests/cases/account/basic.move

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ script {
1818
//check
1919
//# run --signers 0x42
2020
script {
21-
use rooch_framework::account;
21+
use moveos_std::account;
2222
use moveos_std::context::Context;
2323
fun main(ctx: &mut Context, _sender: signer) {
2424
assert!(account::exists_at(ctx, @0x42), 0);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
processed 3 tasks
2+
3+
task 1 'publish'. lines 3-36:
4+
status EXECUTED
5+
6+
task 2 'run'. lines 38-46:
7+
status EXECUTED

crates/rooch-framework-tests/tests/cases/resource/exists_and_move_from.move crates/rooch-framework-tests/tests/cases/account/exists_and_move_from.move

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
//# publish
44
module test::m {
55
use std::signer;
6-
use moveos_std::context::{Self, Context};
6+
use moveos_std::context::{Context};
7+
use moveos_std::account;
78
use moveos_std::signer as moveos_signer;
89

910
struct Test has key{
@@ -14,18 +15,18 @@ module test::m {
1415
fun init(ctx: &mut Context) {
1516
let sender = &moveos_signer::module_signer<Test>();
1617
let sender_addr = signer::address_of(sender);
17-
context::move_resource_to(ctx, sender, Test{
18+
account::move_resource_to(ctx, sender, Test{
1819
addr: sender_addr,
1920
version: 0,
2021
});
2122
}
2223

2324
public fun test_exists_and_move_from(ctx: &mut Context, sender:&signer){
2425
let sender_addr = signer::address_of(sender);
25-
let test_exists = context::exists_resource<Test>(ctx, sender_addr);
26+
let test_exists = account::exists_resource<Test>(ctx, sender_addr);
2627
assert!(test_exists, 1);
27-
let test = context::move_resource_from<Test>(ctx, sender_addr);
28-
let test_exists = context::exists_resource<Test>(ctx, sender_addr);
28+
let test = account::move_resource_from<Test>(ctx, sender_addr);
29+
let test_exists = account::exists_resource<Test>(ctx, sender_addr);
2930
assert!(!test_exists, 2);
3031
let Test{
3132
addr: _,
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
processed 3 tasks
22

3-
task 1 'publish'. lines 3-19:
3+
task 1 'publish'. lines 3-20:
44
status EXECUTED
55

6-
task 2 'run'. lines 21-29:
6+
task 2 'run'. lines 22-30:
77
status EXECUTED

crates/rooch-framework-tests/tests/cases/private_generics/inside_module.move

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
//# publish
44
module creator::test {
5-
use moveos_std::context::{Self, Context};
5+
use moveos_std::context::{Context};
6+
use moveos_std::account;
67

78
struct Foo has key {
89
x: u64,
910
}
1011

1112
#[private_generics(T)]
1213
fun publish_foo<T: key>(ctx: &mut Context, s: &signer) {
13-
context::move_resource_to<Foo>(ctx, s, Foo { x: 500})
14+
account::move_resource_to<Foo>(ctx, s, Foo { x: 500})
1415
}
1516

1617
public fun invoke_publish_foo(ctx: &mut Context, s: &signer) {

crates/rooch-framework-tests/tests/cases/resource/exists_and_move_from.exp

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
processed 7 tasks
22

3-
task 1 'publish'. lines 3-63:
3+
task 1 'publish'. lines 3-64:
44
status EXECUTED
55

6-
task 2 'run'. lines 65-79:
6+
task 2 'run'. lines 66-80:
77
status EXECUTED
88

9-
task 3 'run'. lines 80-95:
9+
task 3 'run'. lines 81-96:
1010
status EXECUTED
1111

12-
task 4 'run'. lines 96-111:
12+
task 4 'run'. lines 97-112:
1313
status EXECUTED
1414

15-
task 5 'run'. lines 112-124:
15+
task 5 'run'. lines 113-125:
1616
status ABORTED with code 4 in 0000000000000000000000000000000000000000000000000000000000000002::raw_table
1717

18-
task 6 'run'. lines 125-138:
18+
task 6 'run'. lines 126-139:
1919
status EXECUTED

crates/rooch-framework-tests/tests/cases/table/test_destroy.move

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module test::m {
55
use std::string::String;
66
use moveos_std::table::{Self, Table};
77
use moveos_std::context::{Self, Context};
8+
use moveos_std::account;
89

910
struct KVStore has store, key {
1011
table: Table<String,vector<u8>>,
@@ -33,19 +34,19 @@ module test::m {
3334
}
3435

3536
public fun save_to_resource_object(ctx: &mut Context, account: &signer, store: KVStore){
36-
context::move_resource_to(ctx, account, store);
37+
account::move_resource_to(ctx, account, store);
3738
}
3839

3940
public fun borrow_from_resource_object(ctx: &Context, account: address) : &KVStore{
40-
context::borrow_resource(ctx, account)
41+
account::borrow_resource(ctx, account)
4142
}
4243

4344
public fun borrow_mut_from_resource_object(ctx: &mut Context, account: address) : &mut KVStore{
44-
context::borrow_mut_resource(ctx, account)
45+
account::borrow_mut_resource(ctx, account)
4546
}
4647

4748
public fun move_from_resource_object(ctx: &mut Context, account: address) : KVStore{
48-
context::move_resource_from(ctx, account)
49+
account::move_resource_from(ctx, account)
4950
}
5051

5152
public fun length(kv: &KVStore): u64 {

0 commit comments

Comments
 (0)