Revert "[Feature] Add ASCII module and TODO: ascii DAO name (#161)"

This reverts commit d3eb047.
starcoinorg · Mar 2, 2023 · 059ca54 · 059ca54
1 parent 47c8ce0
commit 059ca54
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 155 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -6,9 +6,6 @@ compiled_package_info:
     StarcoinFramework: "0x00000000000000000000000000000001"
     VMReserved: "0x00000000000000000000000000000000"
   module_resolution_metadata:
-    ? address: "0x00000000000000000000000000000001"
-      name: ASCII
-    : StarcoinFramework
     ? address: "0x00000000000000000000000000000001"
       name: Account
     : StarcoinFramework
@@ -321,7 +318,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: 4C96D09C5AAF229BF0BFA79CEEEC3E42D49C436FEBA79BBF776354A60A84F1BD
+  source_digest: A155383ABA4B2CECDADAD666C4E012F372A73E64B9B0EA9CA977261219D8ED8E
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/build/StarcoinFramework/docs/README.md b/build/StarcoinFramework/docs/README.md
@@ -12,7 +12,6 @@ This is the root document for the Move StarcoinFramework module documentation. T
 ## Index
 
 
--  [`0x1::ASCII`](ASCII.md#0x1_ASCII)
 -  [`0x1::Account`](Account.md#0x1_Account)
 -  [`0x1::AccountScripts`](AccountScripts.md#0x1_AccountScripts)
 -  [`0x1::AnyMemberPlugin`](AnyMemberPlugin.md#0x1_AnyMemberPlugin)

diff --git a/integration-tests/daospace/dao_ext.exp b/integration-tests/daospace/dao_ext.exp
@@ -2,7 +2,7 @@ processed 9 tasks
 
 task 6 'run'. lines 56-65:
 {
-  "gas_used": 1008684,
+  "gas_used": 964604,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_grant.exp b/integration-tests/daospace/dao_grant.exp
@@ -18,7 +18,7 @@ task 5 'run'. lines 13-21:
 
 task 8 'run'. lines 123-134:
 {
-  "gas_used": 1812265,
+  "gas_used": 1768185,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_proposal.exp b/integration-tests/daospace/dao_proposal.exp
@@ -2,7 +2,7 @@ processed 42 tasks
 
 task 7 'run'. lines 169-180:
 {
-  "gas_used": 1809468,
+  "gas_used": 1765388,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_proposal_rejected.exp b/integration-tests/daospace/dao_proposal_rejected.exp
@@ -2,7 +2,7 @@ processed 40 tasks
 
 task 7 'run'. lines 126-135:
 {
-  "gas_used": 1212834,
+  "gas_used": 1168754,
   "status": {
     "MoveAbort": {
       "location": {

diff --git a/integration-tests/daospace/dao_upgrade.exp b/integration-tests/daospace/dao_upgrade.exp
@@ -20,7 +20,7 @@ task 9 'run'. lines 130-144:
 
 task 10 'run'. lines 145-154:
 {
-  "gas_used": 1095207,
+  "gas_used": 1051127,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_upgrade_incompatible.exp b/integration-tests/daospace/dao_upgrade_incompatible.exp
@@ -14,7 +14,7 @@ task 8 'run'. lines 121-136:
 
 task 9 'run'. lines 138-147:
 {
-  "gas_used": 1095207,
+  "gas_used": 1051127,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/stake_to_sbt_plugin.exp b/integration-tests/daospace/stake_to_sbt_plugin.exp
@@ -2,7 +2,7 @@ processed 17 tasks
 
 task 5 'run'. lines 71-79:
 {
-  "gas_used": 1758694,
+  "gas_used": 1714614,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/xdao.exp b/integration-tests/daospace/xdao.exp
@@ -2,7 +2,7 @@ processed 7 tasks
 
 task 3 'run'. lines 54-61:
 {
-  "gas_used": 1168270,
+  "gas_used": 1124190,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospaceplugin/mint_proposal_plugin.exp b/integration-tests/daospaceplugin/mint_proposal_plugin.exp
@@ -8,7 +8,7 @@ task 8 'run'. lines 71-85:
 
 task 9 'run'. lines 87-96:
 {
-  "gas_used": 1233206,
+  "gas_used": 1189126,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospaceplugin/salary_gov_plugin.exp b/integration-tests/daospaceplugin/salary_gov_plugin.exp
@@ -2,7 +2,7 @@ processed 21 tasks
 
 task 7 'run'. lines 252-264:
 {
-  "gas_used": 1767430,
+  "gas_used": 1723350,
   "status": "Executed"
 }
 

diff --git a/sources/ASCII.move b/sources/ASCII.move
diff --git a/sources/daospace/DAOSpace.move b/sources/daospace/DAOSpace.move
@@ -23,7 +23,6 @@ module StarcoinFramework::DAOSpace {
     use StarcoinFramework::Block;
     use StarcoinFramework::DAOPluginMarketplace;
     use StarcoinFramework::EventUtil;
-    use StarcoinFramework::ASCII;
 
     friend StarcoinFramework::StarcoinDAO;
 
@@ -78,6 +77,7 @@ module StarcoinFramework::DAOSpace {
     /// DAO resource, every DAO has this resource at it's DAO account
     struct DAO has key {
         id: u64,
+        // TODO migrate ASIIC String and use ASSIC String
         name: vector<u8>,
         // description ipfs://xxxxx
         description:vector<u8>,
@@ -269,7 +269,6 @@ module StarcoinFramework::DAOSpace {
 
         let dao_address = Signer::address_of(&dao_signer);
         let id = DAORegistry::register<DAOT>(dao_address);
-        ASCII::string(copy name);
         let dao = DAO{
             id,
             name: copy name,