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

Dao integration test and upgrade mpm #95

Merged
merged 14 commits into from
Aug 29, 2022
Merged
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: FD04C9A39DFAD60C3FA7B7566327BD66B28ABC554C15691EFA399D36AA8EAE4B
source_digest: 954ABD7FF4FEE4DA9E7A4FE93042FFEB6F8A451572BCF05899AED27928F1CD47
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/source_maps/Block.mvsm
Binary file not shown.
Binary file modified build/StarcoinFramework/source_maps/CheckpointScript.mvsm
Binary file not shown.
64 changes: 23 additions & 41 deletions integration-tests/account/basic.exp
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,21 @@ processed 14 tasks
task 5 'run'. lines 30-41:
{
"gas_used": 139240,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 6 'run'. lines 44-55:
{
"gas_used": 43065,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
26119
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "26119"
}
}
}
Expand All @@ -30,64 +26,50 @@ task 7 'run'. lines 58-74:
{
"gas_used": 58850,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
26369
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "26369"
}
}
}

task 8 'run'. lines 76-95:
{
"gas_used": 129486,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 9 'run'. lines 98-110:
{
"gas_used": 154312,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 10 'run'. lines 112-121:
{
"gas_used": 11474,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 11 'run'. lines 123-135:
{
"gas_used": 396842,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 12 'run'. lines 138-147:
{
"gas_used": 20214,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 13 'run'. lines 150-159:
{
"gas_used": 52949,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}
8 changes: 2 additions & 6 deletions integration-tests/account/delegate_account.exp
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@ processed 7 tasks
task 5 'run'. lines 27-44:
{
"gas_used": 618395,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 6 'run'. lines 47-62:
{
"gas_used": 139958,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}
8 changes: 2 additions & 6 deletions integration-tests/account/deposit_zero_token.exp
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@ processed 4 tasks
task 2 'run'. lines 6-16:
{
"gas_used": 45962,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 3 'run'. lines 19-30:
{
"gas_used": 31287,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}
22 changes: 9 additions & 13 deletions integration-tests/account/remove_zero_balance.exp
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,21 @@ processed 4 tasks
task 2 'run'. lines 5-17:
{
"gas_used": 92550,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 3 'run'. lines 19-30:
{
"gas_used": 146733,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Token"
}
},
4097
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Token"
}
},
"abort_code": "4097"
}
}
}
134 changes: 58 additions & 76 deletions integration-tests/account/txn_prologue_and_epilogue.exp
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,21 @@ processed 12 tasks
task 3 'run'. lines 8-23:
{
"gas_used": 494124,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 4 'run'. lines 27-59:
{
"gas_used": 174759,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "CoreAddresses"
}
},
2818
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "CoreAddresses"
}
},
"abort_code": "2818"
}
}
}
Expand All @@ -30,16 +26,14 @@ task 5 'run'. lines 63-90:
{
"gas_used": 329083,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
1031
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "1031"
}
}
}
Expand All @@ -48,16 +42,14 @@ task 6 'run'. lines 94-122:
{
"gas_used": 300870,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
263
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "263"
}
}
}
Expand All @@ -66,42 +58,36 @@ task 7 'run'. lines 126-156:
{
"gas_used": 335601,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
775
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "775"
}
}
}

task 8 'run'. lines 160-205:
{
"gas_used": 403810,
"status": {
"Keep": "Executed"
}
"status": "Executed"
}

task 9 'run'. lines 209-239:
{
"gas_used": 335471,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
519
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "519"
}
}
}
Expand All @@ -110,16 +96,14 @@ task 10 'run'. lines 243-274:
{
"gas_used": 180123,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
2568
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Account"
}
},
"abort_code": "2568"
}
}
}
Expand All @@ -128,16 +112,14 @@ task 11 'run'. lines 278-309:
{
"gas_used": 174016,
"status": {
"Keep": {
"MoveAbort": [
{
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "CoreAddresses"
}
},
2818
]
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "CoreAddresses"
}
},
"abort_code": "2818"
}
}
}
Loading