Revert "Fix (#189)"

This reverts commit 64d754d.
starcoinorg · Mar 3, 2023 · a7a3237 · a7a3237
1 parent 6358b15
commit a7a3237
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 299 deletions.
diff --git a/build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv b/build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv
diff --git a/build/StarcoinFramework/docs/MemberProposalPlugin.md b/build/StarcoinFramework/docs/MemberProposalPlugin.md
@@ -269,17 +269,7 @@
     <b>let</b> proposal_cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_proposal_cap">DAOSpace::acquire_proposal_cap</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(&witness);
     <b>let</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_MemberJoinAction">MemberJoinAction</a>{member, init_sbt, image_data, image_url} = <a href="DAOSpace.md#0x1_DAOSpace_execute_proposal">DAOSpace::execute_proposal</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_MemberJoinAction">MemberJoinAction</a>&gt;(&proposal_cap, sender, proposal_id);
     <b>let</b> member_cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_member_cap">DAOSpace::acquire_member_cap</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(&witness);
-    <b>let</b> op_image_data = <b>if</b>(<a href="Vector.md#0x1_Vector_length">Vector::length</a>(&image_data) == 0){
-        <a href="Option.md#0x1_Option_none">Option::none</a>&lt;vector&lt;u8&gt;&gt;()
-    }<b>else</b>{
-        <a href="Option.md#0x1_Option_some">Option::some</a>(image_data)
-    };
-    <b>let</b> op_image_url = <b>if</b>(<a href="Vector.md#0x1_Vector_length">Vector::length</a>(&image_url) == 0){
-        <a href="Option.md#0x1_Option_none">Option::none</a>&lt;vector&lt;u8&gt;&gt;()
-    }<b>else</b>{
-        <a href="Option.md#0x1_Option_some">Option::some</a>(image_url)
-    };
-    <a href="DAOSpace.md#0x1_DAOSpace_member_offer">DAOSpace::member_offer</a>(&member_cap, member,op_image_data , op_image_url , init_sbt);
+    <a href="DAOSpace.md#0x1_DAOSpace_member_offer">DAOSpace::member_offer</a>(&member_cap, member, <a href="Option.md#0x1_Option_some">Option::some</a>(image_data), <a href="Option.md#0x1_Option_some">Option::some</a>(image_url) , init_sbt);
 }
 </code></pre>
 

diff --git a/build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm b/build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm
diff --git a/integration-tests/daospace/dao_member_proposal.exp b/integration-tests/daospace/dao_member_proposal.exp
diff --git a/integration-tests/daospace/dao_member_proposal.move b/integration-tests/daospace/dao_member_proposal.move
diff --git a/integration-tests/daospaceplugin/gas_oracle_plugin.exp b/integration-tests/daospaceplugin/gas_oracle_plugin.exp
@@ -20,7 +20,7 @@ task 7 'run'. lines 87-96:
 
 task 9 'run'. lines 100-114:
 {
-  "gas_used": 377540,
+  "gas_used": 373579,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospaceplugin/mint_proposal_plugin.exp b/integration-tests/daospaceplugin/mint_proposal_plugin.exp
@@ -37,7 +37,7 @@ task 11 'run'. lines 110-123:
 
 task 12 'run'. lines 125-139:
 {
-  "gas_used": 377540,
+  "gas_used": 373579,
   "status": "Executed"
 }
 

diff --git a/sources/daospaceplugin/AnyMemberPlugin.move b/sources/daospaceplugin/AnyMemberPlugin.move
@@ -42,17 +42,7 @@ module StarcoinFramework::AnyMemberPlugin{
         let witness = AnyMemberPlugin{};
         let member_cap = DAOSpace::acquire_member_cap<DAOT, AnyMemberPlugin>(&witness);
         IdentifierNFT::accept<DAOSpace::DAOMember<DAOT>,DAOSpace::DAOMemberBody<DAOT>>(sender);
-        let op_image_data = if(Vector::is_empty(&image_data)){
-            Option::none<vector<u8>>()
-        }else{
-            Option::some(image_data)
-        };
-        let op_image_url = if(Vector::is_empty(&image_url)){
-            Option::none<vector<u8>>()
-        }else{
-            Option::some(image_url)
-        };
-        DAOSpace::join_member_with_member_cap(&member_cap, Signer::address_of(sender), op_image_data, op_image_url, 1);
+        DAOSpace::join_member_with_member_cap(&member_cap, Signer::address_of(sender), Option::some(image_data), Option::some(image_url), 1);
     }
 
     public (script) fun join_entry<DAOT: store>(sender: signer, image_data:vector<u8>, image_url:vector<u8>){

diff --git a/sources/daospaceplugin/MemberProposalPlugin.move b/sources/daospaceplugin/MemberProposalPlugin.move
@@ -70,17 +70,7 @@ module StarcoinFramework::MemberProposalPlugin{
         let proposal_cap = DAOSpace::acquire_proposal_cap<DAOT, MemberProposalPlugin>(&witness);
         let MemberJoinAction{member, init_sbt, image_data, image_url} = DAOSpace::execute_proposal<DAOT, MemberProposalPlugin, MemberJoinAction>(&proposal_cap, sender, proposal_id);
         let member_cap = DAOSpace::acquire_member_cap<DAOT, MemberProposalPlugin>(&witness);
-        let op_image_data = if(Vector::length(&image_data) == 0){
-            Option::none<vector<u8>>()
-        }else{
-            Option::some(image_data)
-        };
-        let op_image_url = if(Vector::length(&image_url) == 0){
-            Option::none<vector<u8>>()
-        }else{
-            Option::some(image_url)
-        };
-        DAOSpace::member_offer(&member_cap, member,op_image_data , op_image_url , init_sbt);
+        DAOSpace::member_offer(&member_cap, member, Option::some(image_data), Option::some(image_url) , init_sbt);
     }
 
     public (script) fun execute_proposal_entry<DAOT: store>(sender: signer, proposal_id: u64){