update with the latest dependencies

input-output-hk · Oct 14, 2021 · ed87a94 · ed87a94
1 parent 9f5ada0
commit ed87a94
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/recovery/tally.rs b/src/recovery/tally.rs
@@ -604,12 +604,12 @@ mod test {
     use chain_impl_mockchain::chaintypes::ConsensusType;
     use chain_impl_mockchain::vote::Choice;
     use chain_impl_mockchain::vote::Tally;
-    use jormungandr_integration_tests::common::jormungandr::ConfigurationBuilder;
     use jormungandr_lib::interfaces::load_persistent_fragments_logs_from_folder_path;
     use jormungandr_lib::interfaces::KesUpdateSpeed;
     use jormungandr_lib::interfaces::PersistentFragmentLog;
     use jormungandr_lib::time::SecondsSinceUnixEpoch;
     use jormungandr_testing_utils::testing::fragments::write_into_persistent_log;
+    use jormungandr_testing_utils::testing::jormungandr::ConfigurationBuilder;
     use jormungandr_testing_utils::testing::vote_plan_cert;
     use jormungandr_testing_utils::testing::VotePlanBuilder;
     use jormungandr_testing_utils::wallet::Wallet as TestWallet;

diff --git a/tests/tally/generator.rs b/tests/tally/generator.rs
@@ -69,7 +69,7 @@ impl VoteRoundGenerator {
             );
         }
 
-        let block0_hash = config.to_block().header.id().into();
+        let block0_hash = config.to_block().header().id().into();
         Self {
             block0: config,
             block0_hash,
@@ -172,7 +172,7 @@ impl VoteRoundGenerator {
             .map(|member| member.public_key())
             .collect::<Vec<_>>();
 
-        let tmp_ledger = Ledger::new(block0.header.id(), block0.fragments()).unwrap();
+        let tmp_ledger = Ledger::new(block0.header().id(), block0.fragments()).unwrap();
         let stake_control = StakeControl::new_with(tmp_ledger.accounts(), &utxo::Ledger::new());
         let table = chain_vote::TallyOptimizationTable::generate(stake_control.assigned().into());
 
@@ -230,7 +230,8 @@ impl VoteRoundGenerator {
                                     }
                                 })
                                 .collect::<Vec<_>>(),
-                        );
+                        )
+                        .unwrap();
 
                         manager = manager
                             .finalize_private_tally(&decrypted_tally, &Default::default(), |_| ())

diff --git a/tests/tally/main.rs b/tests/tally/main.rs
@@ -404,7 +404,7 @@ fn votes_outside_voting_phase() {
     committee_wallet.update_counter(0);
     let early_tally_fragment = committee_wallet
         .issue_vote_tally_cert(
-            &generator.block0().header.id().into(),
+            &generator.block0().header().id().into(),
             &generator
                 .block0_config()
                 .blockchain_configuration
@@ -483,7 +483,7 @@ fn transaction_transfer() {
     // transfer all funds from the first wallet to the second
     let transaction = (&mut wallets[0])
         .transaction_to(
-            &generator.block0().header.id().into(),
+            &generator.block0().header().id().into(),
             &generator
                 .block0_config()
                 .blockchain_configuration
@@ -593,7 +593,7 @@ fn cast_vote(
 ) -> Fragment {
     wallet
         .issue_vote_cast_cert(
-            &generator.block0().header.id().into(),
+            &generator.block0().header().id().into(),
             &generator
                 .block0_config()
                 .blockchain_configuration