Revert "check StakeList existence (#124)"

This reverts commit dee9a0b.
starcoinorg · Mar 3, 2023 · 4c89753 · 4c89753
1 parent 68876f2
commit 4c89753
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -312,7 +312,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: DC60876727975D2C568C06813162A81120B13D4F6A6B636E13364139A16514B3
+  source_digest: B85EC5CCB8E021D9974D19AD20C43DBC20D2AE625A72A096A5BAED676B5D9F1F
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/integration-tests/daospace/stake_to_sbt_plugin.exp b/integration-tests/daospace/stake_to_sbt_plugin.exp
@@ -8,13 +8,13 @@ task 5 'run'. lines 61-69:
 
 task 6 'run'. lines 71-107:
 {
-  "gas_used": 652577,
+  "gas_used": 652263,
   "status": "Executed"
 }
 
 task 7 'run'. lines 109-120:
 {
-  "gas_used": 38522,
+  "gas_used": 38208,
   "status": {
     "MoveAbort": {
       "location": {
@@ -30,19 +30,19 @@ task 7 'run'. lines 109-120:
 
 task 9 'run'. lines 124-137:
 {
-  "gas_used": 86636,
+  "gas_used": 86008,
   "status": "Executed"
 }
 
 task 10 'run'. lines 139-155:
 {
-  "gas_used": 419842,
+  "gas_used": 419528,
   "status": "Executed"
 }
 
 task 12 'run'. lines 159-172:
 {
-  "gas_used": 217386,
+  "gas_used": 216758,
   "status": "Executed"
 }
 
@@ -54,7 +54,7 @@ task 13 'run'. lines 174-190:
 
 task 15 'run'. lines 194-209:
 {
-  "gas_used": 226351,
+  "gas_used": 225723,
   "status": "Executed"
 }
 

diff --git a/sources/daospaceplugin/StakeToSBTPlugin.move b/sources/daospaceplugin/StakeToSBTPlugin.move
@@ -24,14 +24,14 @@ module StarcoinFramework::StakeToSBTPlugin {
     struct Stake<phantom DAOT, phantom TokenT> has key, store {
         id: u64,
         token: Token::Token<TokenT>,
-        // The timestamp when user stake
         stake_time: u64,
-        // How long where the user locked
+        // The timestamp when user stake
         lock_time: u64,
-        // Which multiplier by the user stake
+        // How long where the user locked
         weight: u64,
-        //  The SBT amount that user swap in the token
+        // Which multiplier by the user stake
         sbt_amount: u128,
+        //  The SBT amount that user swap in the token
     }
 
     struct StakeList<phantom DAOT, phantom TokenT> has key, store {
@@ -215,7 +215,6 @@ module StarcoinFramework::StakeToSBTPlugin {
 
     public fun query_stake<DAOT: store, TokenT: store>(member: address, id: u64)
     : (u64, u64, u64, u128, u128) acquires StakeList {
-        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let item_index = find_item(id, &stake_list.items);
 
@@ -235,14 +234,12 @@ module StarcoinFramework::StakeToSBTPlugin {
 
     /// Query stake count from stake list
     public fun query_stake_count<DAOT: store, TokenT: store>(member: address): u64 acquires StakeList {
-        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global<StakeList<DAOT, TokenT>>(member);
         Vector::length(&stake_list.items)
     }
 
     /// Unstake from staking
     public fun unstake_by_id<DAOT: store, TokenT: store>(member: address, id: u64) acquires StakeList {
-        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let item_index = find_item(id, &stake_list.items);
 
@@ -279,7 +276,6 @@ module StarcoinFramework::StakeToSBTPlugin {
     /// Unstake all staking items from member address,
     /// No care whether the user is member or not
     public fun unstake_all<DAOT: store, TokenT: store>(member: address) acquires StakeList {
-        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let len = Vector::length(&mut stake_list.items);