parazyd 2 лет назад
Родитель
Сommit
f04a44d255

+ 2 - 1
bin/darkfid/src/tests/harness.rs

@@ -71,7 +71,8 @@ impl Harness {
     ) -> Result<Self> {
         // Use test harness to generate genesis transactions
         let mut th = TestHarness::new(&[Holder::Bob], verify_fees).await?;
-        let (genesis_mint_tx, _) = th.genesis_mint(&Holder::Bob, config.bob_initial).await?;
+        let (genesis_mint_tx, _) =
+            th.genesis_mint(&Holder::Bob, config.bob_initial, None, None).await?;
 
         // Generate default genesis block
         let mut genesis_block = BlockInfo::default();

+ 2 - 2
src/contract/money/tests/genesis_mint.rs

@@ -51,7 +51,7 @@ fn genesis_mint() -> Result<()> {
         info!(target: "money", "[Alice] Building genesis mint tx");
         info!(target: "money", "[Alice] ========================");
         let (genesis_mint_tx, genesis_mint_params) =
-            th.genesis_mint(&Holder::Alice, ALICE_INITIAL).await?;
+            th.genesis_mint(&Holder::Alice, ALICE_INITIAL, None, None).await?;
 
         info!(target: "money", "[Malicious] =============================================");
         info!(target: "money", "[Malicious] Checking genesis mint tx not on genesis block");
@@ -87,7 +87,7 @@ fn genesis_mint() -> Result<()> {
         info!(target: "money", "[Bob] Building genesis mint tx");
         info!(target: "money", "[Bob] ========================");
         let (genesis_mint_tx, genesis_mint_params) =
-            th.genesis_mint(&Holder::Bob, BOB_INITIAL).await?;
+            th.genesis_mint(&Holder::Bob, BOB_INITIAL, None, None).await?;
 
         for holder in &HOLDERS {
             info!(target: "money", "[{holder:?}] =============================");

+ 14 - 1
src/contract/money/tests/mint_pay_swap.rs

@@ -29,7 +29,9 @@
 
 use darkfi::Result;
 use darkfi_contract_test_harness::{init_logger, Holder, TestHarness};
+use darkfi_sdk::crypto::BaseBlind;
 use log::info;
+use rand::rngs::OsRng;
 
 #[test]
 fn mint_pay_swap() -> Result<()> {
@@ -59,11 +61,13 @@ fn mint_pay_swap() -> Result<()> {
         info!(target: "money", "[Alice] ================================");
         info!(target: "money", "[Alice] Building token mint tx for Alice");
         info!(target: "money", "[Alice] ================================");
+        let alice_token_blind = BaseBlind::random(&mut OsRng);
         let (mint_tx, mint_params, mint_auth_params, fee_params) = th
             .token_mint(
                 ALICE_INITIAL,
                 &Holder::Alice,
                 &Holder::Alice,
+                alice_token_blind,
                 None,
                 None,
                 current_block_height,
@@ -91,8 +95,17 @@ fn mint_pay_swap() -> Result<()> {
         info!(target: "money", "[Bob] ==============================");
         info!(target: "money", "[Bob] Building token mint tx for Bob");
         info!(target: "money", "[Bob] ==============================");
+        let bob_token_blind = BaseBlind::random(&mut OsRng);
         let (mint_tx, mint_params, mint_auth_params, fee_params) = th
-            .token_mint(BOB_INITIAL, &Holder::Bob, &Holder::Bob, None, None, current_block_height)
+            .token_mint(
+                BOB_INITIAL,
+                &Holder::Bob,
+                &Holder::Bob,
+                bob_token_blind,
+                None,
+                None,
+                current_block_height,
+            )
             .await?;
 
         for holder in &HOLDERS {

+ 12 - 1
src/contract/money/tests/token_mint.rs

@@ -18,7 +18,9 @@
 
 use darkfi::Result;
 use darkfi_contract_test_harness::{init_logger, Holder, TestHarness};
+use darkfi_sdk::crypto::BaseBlind;
 use log::info;
+use rand::rngs::OsRng;
 
 #[test]
 fn token_mint() -> Result<()> {
@@ -38,8 +40,17 @@ fn token_mint() -> Result<()> {
         let mut th = TestHarness::new(&HOLDERS, false).await?;
 
         info!("[Bob] Building BOB token mint tx");
+        let bob_token_blind = BaseBlind::random(&mut OsRng);
         let (token_mint_tx, token_mint_params, token_auth_mint_params, fee_params) = th
-            .token_mint(BOB_SUPPLY, &Holder::Bob, &Holder::Bob, None, None, current_block_height)
+            .token_mint(
+                BOB_SUPPLY,
+                &Holder::Bob,
+                &Holder::Bob,
+                bob_token_blind,
+                None,
+                None,
+                current_block_height,
+            )
             .await?;
 
         for holder in &HOLDERS {

+ 1 - 0
src/contract/test-harness/src/money_token.rs

@@ -47,6 +47,7 @@ use super::{Holder, TestHarness};
 
 impl TestHarness {
     /// Mint an arbitrary token for a given recipient using `Money::TokenMint`
+    #[allow(clippy::too_many_arguments)]
     pub async fn token_mint(
         &mut self,
         amount: u64,