Jelajahi Sumber

contracts: simplyfied status update returns

skoupidi 1 tahun lalu
induk
melakukan
295590a45e

+ 1 - 3
src/contract/dao/src/entrypoint/exec.rs

@@ -142,9 +142,7 @@ pub(crate) fn dao_exec_process_instruction(
 
     // Create state update
     let update = DaoExecUpdate { proposal_bulla: params.proposal_bulla };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Dao::Exec`

+ 1 - 4
src/contract/dao/src/entrypoint/mint.rs

@@ -82,10 +82,7 @@ pub(crate) fn dao_mint_process_instruction(
 
     // Create state update
     let update = DaoMintUpdate { dao_bulla: params.dao_bulla };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Dao::Mint`

+ 1 - 3
src/contract/dao/src/entrypoint/propose.rs

@@ -218,9 +218,7 @@ pub(crate) fn dao_propose_process_instruction(
     // Create state update
     let update =
         DaoProposeUpdate { proposal_bulla: params.proposal_bulla, snapshot_coins, snapshot_nulls };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Dao::Propose`

+ 1 - 4
src/contract/dao/src/entrypoint/vote.rs

@@ -168,10 +168,7 @@ pub(crate) fn dao_vote_process_instruction(
     // Create state update
     let update =
         DaoVoteUpdate { proposal_bulla: params.proposal_bulla, proposal_metadata, vote_nullifiers };
-
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Dao::Vote`

+ 1 - 3
src/contract/deployooor/src/entrypoint/deploy_v1.rs

@@ -142,9 +142,7 @@ pub(crate) fn deploy_process_instruction_v1(
     }
 
     let update = DeployUpdateV1 { contract_id };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Deploy::DeployV1`

+ 1 - 4
src/contract/deployooor/src/entrypoint/lock_v1.rs

@@ -81,10 +81,7 @@ pub(crate) fn lock_process_instruction_v1(
     }
 
     let update = LockUpdateV1 { contract_id };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Deploy::LockV1`

+ 1 - 4
src/contract/money/src/entrypoint/auth_token_freeze_v1.rs

@@ -83,10 +83,7 @@ pub(crate) fn money_auth_token_freeze_process_instruction_v1(
 
     // Create a state update. We only need the new coin.
     let update = MoneyAuthTokenFreezeUpdateV1 { token_id: params.token_id };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::AuthTokenFreezeV1`

+ 1 - 4
src/contract/money/src/entrypoint/auth_token_mint_v1.rs

@@ -78,10 +78,7 @@ pub(crate) fn money_auth_token_mint_process_instruction_v1(
 
     // Create a state update.
     let update = MoneyAuthTokenMintUpdateV1 {};
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::AuthTokenMintV1`

+ 1 - 3
src/contract/money/src/entrypoint/fee_v1.rs

@@ -189,10 +189,8 @@ pub(crate) fn money_fee_process_instruction_v1(
         height: verifying_block_height,
         fee: paid_fee,
     };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
     // and return it
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::FeeV1`

+ 1 - 4
src/contract/money/src/entrypoint/genesis_mint_v1.rs

@@ -142,10 +142,7 @@ pub(crate) fn money_genesis_mint_process_instruction_v1(
 
     // Create a state update. We only need the new coins.
     let update = MoneyGenesisMintUpdateV1 { coins: new_coins };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::GenesisMintV1`

+ 1 - 4
src/contract/money/src/entrypoint/pow_reward_v1.rs

@@ -155,10 +155,7 @@ pub(crate) fn money_pow_reward_process_instruction_v1(
     // Create a state update. We only need the new coin.
     let update =
         MoneyPoWRewardUpdateV1 { coin: params.output.coin, height: verifying_block_height };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::PoWRewardV1`

+ 2 - 5
src/contract/money/src/entrypoint/swap_v1.rs

@@ -31,7 +31,7 @@ use darkfi_sdk::{
     pasta::pallas,
     wasm, ContractCall,
 };
-use darkfi_serial::{deserialize, serialize, Encodable};
+use darkfi_serial::{deserialize, serialize};
 
 use super::transfer_v1::{money_transfer_get_metadata_v1, money_transfer_process_update_v1};
 use crate::{
@@ -148,10 +148,7 @@ pub(crate) fn money_otcswap_process_instruction_v1(
     // they're essentially the same thing, just with a different transition
     // ruleset.
     let update = MoneyTransferUpdateV1 { nullifiers: new_nullifiers, coins: new_coins };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::OtcSwapV1`

+ 1 - 4
src/contract/money/src/entrypoint/token_mint_v1.rs

@@ -100,10 +100,7 @@ pub(crate) fn money_token_mint_process_instruction_v1(
 
     // Create a state update. We only need the new coin.
     let update = MoneyTokenMintUpdateV1 { coin: params.coin };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
-
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::TokenMintV1`

+ 1 - 3
src/contract/money/src/entrypoint/transfer_v1.rs

@@ -222,10 +222,8 @@ pub(crate) fn money_transfer_process_instruction_v1(
 
     // At this point the state transition has passed, so we create a state update
     let update = MoneyTransferUpdateV1 { nullifiers: new_nullifiers, coins: new_coins };
-    let mut update_data = vec![];
-    update.encode(&mut update_data)?;
     // and return it
-    Ok(update_data)
+    Ok(serialize(&update))
 }
 
 /// `process_update` function for `Money::TransferV1`