Revert "Dao integration test and upgrade mpm (#95)"

This reverts commit 82032cc.
starcoinorg · Mar 2, 2023 · 1f236bb · 1f236bb
1 parent e8f810d
commit 1f236bb
Show file tree

Hide file tree

Showing 148 changed files with 2,547 additions and 2,068 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -300,7 +300,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: 954ABD7FF4FEE4DA9E7A4FE93042FFEB6F8A451572BCF05899AED27928F1CD47
+  source_digest: FD04C9A39DFAD60C3FA7B7566327BD66B28ABC554C15691EFA399D36AA8EAE4B
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/build/StarcoinFramework/source_maps/Block.mvsm b/build/StarcoinFramework/source_maps/Block.mvsm
diff --git a/build/StarcoinFramework/source_maps/CheckpointScript.mvsm b/build/StarcoinFramework/source_maps/CheckpointScript.mvsm
diff --git a/integration-tests/account/basic.exp b/integration-tests/account/basic.exp
@@ -3,21 +3,25 @@ processed 14 tasks
 task 5 'run'. lines 30-41:
 {
   "gas_used": 139240,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 6 'run'. lines 44-55:
 {
   "gas_used": 43065,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "26119"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        26119
+      ]
     }
   }
 }
@@ -26,50 +30,64 @@ task 7 'run'. lines 58-74:
 {
   "gas_used": 58850,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "26369"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        26369
+      ]
     }
   }
 }
 
 task 8 'run'. lines 76-95:
 {
   "gas_used": 129486,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 9 'run'. lines 98-110:
 {
   "gas_used": 154312,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 10 'run'. lines 112-121:
 {
   "gas_used": 11474,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 11 'run'. lines 123-135:
 {
   "gas_used": 396842,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 12 'run'. lines 138-147:
 {
   "gas_used": 20214,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 13 'run'. lines 150-159:
 {
   "gas_used": 52949,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
diff --git a/integration-tests/account/delegate_account.exp b/integration-tests/account/delegate_account.exp
@@ -3,11 +3,15 @@ processed 7 tasks
 task 5 'run'. lines 27-44:
 {
   "gas_used": 618395,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 6 'run'. lines 47-62:
 {
   "gas_used": 139958,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
diff --git a/integration-tests/account/deposit_zero_token.exp b/integration-tests/account/deposit_zero_token.exp
@@ -3,11 +3,15 @@ processed 4 tasks
 task 2 'run'. lines 6-16:
 {
   "gas_used": 45962,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 3 'run'. lines 19-30:
 {
   "gas_used": 31287,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
diff --git a/integration-tests/account/remove_zero_balance.exp b/integration-tests/account/remove_zero_balance.exp
@@ -3,21 +3,25 @@ processed 4 tasks
 task 2 'run'. lines 5-17:
 {
   "gas_used": 92550,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 3 'run'. lines 19-30:
 {
   "gas_used": 146733,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Token"
-        }
-      },
-      "abort_code": "4097"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Token"
+          }
+        },
+        4097
+      ]
     }
   }
 }
diff --git a/integration-tests/account/txn_prologue_and_epilogue.exp b/integration-tests/account/txn_prologue_and_epilogue.exp
@@ -3,21 +3,25 @@ processed 12 tasks
 task 3 'run'. lines 8-23:
 {
   "gas_used": 494124,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 4 'run'. lines 27-59:
 {
   "gas_used": 174759,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "CoreAddresses"
-        }
-      },
-      "abort_code": "2818"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "CoreAddresses"
+          }
+        },
+        2818
+      ]
     }
   }
 }
@@ -26,14 +30,16 @@ task 5 'run'. lines 63-90:
 {
   "gas_used": 329083,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "1031"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        1031
+      ]
     }
   }
 }
@@ -42,14 +48,16 @@ task 6 'run'. lines 94-122:
 {
   "gas_used": 300870,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "263"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        263
+      ]
     }
   }
 }
@@ -58,36 +66,42 @@ task 7 'run'. lines 126-156:
 {
   "gas_used": 335601,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "775"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        775
+      ]
     }
   }
 }
 
 task 8 'run'. lines 160-205:
 {
   "gas_used": 403810,
-  "status": "Executed"
+  "status": {
+    "Keep": "Executed"
+  }
 }
 
 task 9 'run'. lines 209-239:
 {
   "gas_used": 335471,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "519"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        519
+      ]
     }
   }
 }
@@ -96,14 +110,16 @@ task 10 'run'. lines 243-274:
 {
   "gas_used": 180123,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "Account"
-        }
-      },
-      "abort_code": "2568"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "Account"
+          }
+        },
+        2568
+      ]
     }
   }
 }
@@ -112,14 +128,16 @@ task 11 'run'. lines 278-309:
 {
   "gas_used": 174016,
   "status": {
-    "MoveAbort": {
-      "location": {
-        "Module": {
-          "address": "0x00000000000000000000000000000001",
-          "name": "CoreAddresses"
-        }
-      },
-      "abort_code": "2818"
+    "Keep": {
+      "MoveAbort": [
+        {
+          "Module": {
+            "address": "0x00000000000000000000000000000001",
+            "name": "CoreAddresses"
+          }
+        },
+        2818
+      ]
     }
   }
 }