Revert "check DAOAccountCap (#89)"

This reverts commit 0404a53.
starcoinorg · Mar 3, 2023 · 17d571f · 17d571f
1 parent a7a2b34
commit 17d571f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 67 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: 7383E555375A13FC20185C03038B1A256C817A71C484233F6D7EAEE9FA1263EA
+  source_digest: 7138A8A0DEBB195CC13E43D24FAACA4CCE188BA3536A5DED8646E8934CBC2431
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/integration-tests/daospace/dao_account.exp b/integration-tests/daospace/dao_account.exp
@@ -1,53 +1,17 @@
-processed 6 tasks
+processed 4 tasks
 
 task 2 'run'. lines 6-23:
 {
-  "gas_used": 837509,
+  "gas_used": 827652,
   "status": {
     "Keep": "Executed"
   }
 }
 
 task 3 'run'. lines 28-40:
 {
-  "gas_used": 84519,
+  "gas_used": 74662,
   "status": {
     "Keep": "Executed"
   }
 }
-
-task 4 'run'. lines 42-51:
-{
-  "gas_used": 712879,
-  "status": {
-    "Keep": {
-      "MoveAbort": [
-        {
-          "Module": {
-            "address": "0x00000000000000000000000000000001",
-            "name": "DAOAccount"
-          }
-        },
-        25862
-      ]
-    }
-  }
-}
-
-task 5 'run'. lines 53-61:
-{
-  "gas_used": 711648,
-  "status": {
-    "Keep": {
-      "MoveAbort": [
-        {
-          "Module": {
-            "address": "0x00000000000000000000000000000001",
-            "name": "DAOAccount"
-          }
-        },
-        25862
-      ]
-    }
-  }
-}
diff --git a/integration-tests/daospace/dao_account.move b/integration-tests/daospace/dao_account.move
@@ -1,6 +1,6 @@
 //# init -n dev
 
-//# faucet --addr alice --amount 10000000
+//# faucet --addr alice --amount 1000000
 
 
 //# run --signers alice
@@ -37,25 +37,4 @@ script {
         DAOAccount::restore_dao_account_cap(&sender, dao_cap);
     }
 }
-// check: EXECUTED
-
-//# run --signers alice
-script {
-    use StarcoinFramework::DAOAccount;
-
-    fun main(sender: signer) {
-        let dao_cap = DAOAccount::create_account(&sender);
-        DAOAccount::restore_dao_account_cap(&sender, dao_cap);
-    }
-}
-// check: ABORT, code 25862. Reason:  alice already has a DAOAccountCap
-
-//# run --signers alice
-script {
-    use StarcoinFramework::DAOAccount;
-
-    fun main(sender: signer) {
-        DAOAccount::create_account_entry(sender);
-    }
-}
-// check: ABORT, code 25862. Reason:  alice already has a DAOAccountCap 
+// check: EXECUTED
diff --git a/sources/daospace/DAOAccount.move b/sources/daospace/DAOAccount.move
@@ -13,7 +13,6 @@ module StarcoinFramework::DAOAccount{
     }
 
     const ERR_ACCOUNT_CAP_NOT_EXISTS:u64 = 100;
-    const ERR_ACCOUNT_CAP_EXISTS: u64 = 101;
 
     /// DAOAccount
     struct DAOAccount has key{
@@ -37,7 +36,6 @@ module StarcoinFramework::DAOAccount{
     /// Entry function for create dao account, the `DAOAccountCap` save to the `creator` account
     public(script) fun create_account_entry(sender: signer){
         let cap = create_account(&sender);
-        assert!(!exists<DAOAccountCap>(Signer::address_of(&sender)), Errors::already_published(ERR_ACCOUNT_CAP_EXISTS));
         move_to(&sender, cap);
     }
 
@@ -50,8 +48,6 @@ module StarcoinFramework::DAOAccount{
 
     /// Restore the DAOAccountCap to the `sender`
     public fun restore_dao_account_cap(sender: &signer, cap: DAOAccountCap) {
-        let sender_addr = Signer::address_of(sender);
-        assert!(!exists<DAOAccountCap>(sender_addr), Errors::already_published(ERR_ACCOUNT_CAP_EXISTS));
         move_to(sender, cap)
     }