[AptosFramework] unified with core framework

Closes: aptos-labs#554
serbangv · Apr 20, 2022 · 02bdb3a · 02bdb3a
1 parent b93724b
commit 02bdb3a
Show file tree

Hide file tree

Showing 55 changed files with 2,002 additions and 6,255 deletions.
diff --git a/api/goldens/aptos_api__tests__accounts_test__test_account_modules.json b/api/goldens/aptos_api__tests__accounts_test__test_account_modules.json
diff --git a/api/goldens/aptos_api__tests__accounts_test__test_account_modules_structs.json b/api/goldens/aptos_api__tests__accounts_test__test_account_modules_structs.json
diff --git a/api/goldens/aptos_api__tests__accounts_test__test_account_resources_response.json b/api/goldens/aptos_api__tests__accounts_test__test_account_resources_response.json
@@ -23,12 +23,6 @@
       }
     }
   },
-  {
-    "type": "0x1::Account::Marker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
   {
     "type": "0x1::Account::Account",
     "data": {
@@ -42,7 +36,7 @@
     "data": {
       "currency_code_required": false,
       "module_addr": "0x1",
-      "module_name": "0x4170746f734163636f756e74",
+      "module_name": "0x4163636f756e74",
       "module_prologue_name": "0x6d6f64756c655f70726f6c6f677565",
       "multi_agent_prologue_name": "0x7363726970745f70726f6c6f677565",
       "script_prologue_name": "0x7363726970745f70726f6c6f677565",
@@ -63,12 +57,6 @@
       "major": "4"
     }
   },
-  {
-    "type": "0x1::Version::VersionChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
   {
     "type": "0x1::TestCoin::Balance",
     "data": {
@@ -153,22 +141,28 @@
       }
     }
   },
-  {
-    "type": "0x1::VMConfig::VMConfigChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
   {
     "type": "0x1::Timestamp::CurrentTimeMicroseconds",
     "data": {
       "microseconds": "0"
     }
   },
   {
-    "type": "0x1::Capability::CapState<0x1::Marker::ChainMarker>",
+    "type": "0x1::ValidatorSet::ValidatorSet",
     "data": {
-      "delegates": []
+      "scheme": 0,
+      "validators": [
+        {
+          "addr": "0xf85fd00e30cd388d2609db24d6cc44f2652f27413456938eaa059f65231647cc",
+          "config": {
+            "consensus_pubkey": "0xcc62332e34bb2d5cd69f60efbb2a36cb916c7eb458301ea36636c4dbb012bd88",
+            "fullnode_network_addresses": "0x012d040000000000050c1c07203432fbf5b666fa771269cc7eb227146d3b16858f177a317ae8c349db210feb780800",
+            "validator_network_addresses": "0x012d0400000000000524180720d5db8911156f3441c0757d97b8580cb639853454ec1a560f4927cf4acdfbd1080800"
+          },
+          "consensus_voting_power": "1",
+          "last_config_update_time": "0"
+        }
+      ]
     }
   },
   {
@@ -177,12 +171,6 @@
       "config": "0x0101010a000000000000001400000000000000"
     }
   },
-  {
-    "type": "0x1::ConsensusConfig::ConsensusConfigChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
   {
     "type": "0x1::Reconfiguration::Configuration",
     "data": {
@@ -202,48 +190,6 @@
       "last_reconfiguration_time": "0"
     }
   },
-  {
-    "type": "0x1::ValidatorConfig::ValidatorConfigChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
-  {
-    "type": "0x1::ValidatorSystem::ValidatorSystem",
-    "data": {
-      "scheme": 0,
-      "validators": [
-        {
-          "addr": "0xf85fd00e30cd388d2609db24d6cc44f2652f27413456938eaa059f65231647cc",
-          "config": {
-            "consensus_pubkey": "0xcc62332e34bb2d5cd69f60efbb2a36cb916c7eb458301ea36636c4dbb012bd88",
-            "fullnode_network_addresses": "0x012d040000000000050c1c07203432fbf5b666fa771269cc7eb227146d3b16858f177a317ae8c349db210feb780800",
-            "validator_network_addresses": "0x012d0400000000000524180720d5db8911156f3441c0757d97b8580cb639853454ec1a560f4927cf4acdfbd1080800"
-          },
-          "consensus_voting_power": "1",
-          "last_config_update_time": "0"
-        }
-      ]
-    }
-  },
-  {
-    "type": "0x1::ValidatorSystem::ValidatorSetChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
-  {
-    "type": "0x1::ValidatorOperatorConfig::ValidatorOperatorConfigChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
-  {
-    "type": "0x1::TransactionPublishingOption::ChainMarker<0x1::Marker::ChainMarker>",
-    "data": {
-      "dummy_field": false
-    }
-  },
   {
     "type": "0x1::TransactionPublishingOption::TransactionPublishingOption",
     "data": {

diff --git a/api/goldens/aptos_api__tests__accounts_test__test_get_module_aptos_config.json b/api/goldens/aptos_api__tests__accounts_test__test_get_module_aptos_config.json
diff --git a/api/goldens/aptos_api__tests__accounts_test__test_get_module_with_script_functions.json b/api/goldens/aptos_api__tests__accounts_test__test_get_module_with_script_functions.json
diff --git a/...os_api__tests__invalid_post_request_test__test_invalid_script_function_function_name.json b/...os_api__tests__invalid_post_request_test__test_invalid_script_function_function_name.json
@@ -1,4 +1,4 @@
 {
   "code": 400,
-  "message": "invalid request body: invalid UserTransactionRequest: could not find script function by 0x1::AptosAccount::invalid"
+  "message": "invalid request body: invalid UserTransactionRequest: could not find script function by 0x1::Account::invalid"
 }
diff --git a/...ns/aptos_api__tests__invalid_post_request_test__test_invalid_type_argument_data_type.json b/...ns/aptos_api__tests__invalid_post_request_test__test_invalid_type_argument_data_type.json
@@ -1,4 +1,4 @@
 {
   "code": 400,
-  "message": "Request body deserialize error: deserialize Move type failed, invalid type: boolean `true`, expected a string at line 1 column 324"
+  "message": "Request body deserialize error: deserialize Move type failed, invalid type: boolean `true`, expected a string at line 1 column 319"
 }