refactor wait_for_* methods

testing/jormungandr-testing-utils/src/testing/node/time.rs

@@ -1,23 +1,30 @@
 use super::JormungandrRest;
+use chain_impl_mockchain::block::BlockDate as ChainBlockDate;
 use jormungandr_lib::interfaces::BlockDate;
 use std::str::FromStr;
 
-pub fn wait_for_epoch(target_epoch_id: u32, mut rest: JormungandrRest) {
-    rest.enable_logger();
-
-    while get_current_date(&mut rest).epoch() < target_epoch_id {
-        std::thread::sleep(std::time::Duration::from_secs(1));
-    }
+pub fn wait_for_epoch(epoch: u32, rest: JormungandrRest) {
+    wait_for_date(ChainBlockDate { epoch, slot_id: 0 }.into(), rest)
 }
 
 pub fn wait_for_date(target_block_date: BlockDate, mut rest: JormungandrRest) {
-    rest.enable_logger();
-
-    while get_current_date(&mut rest) < target_block_date {
-        std::thread::sleep(std::time::Duration::from_secs(1));
+    let settings = rest.settings().unwrap();
+    while is_it_due(get_current_date(&mut rest), target_block_date) {
+        std::thread::sleep(std::time::Duration::from_secs(settings.slot_duration));
     }
 }
 
+fn is_it_due(current_block_date: BlockDate, target_block_date: BlockDate) -> bool {
+    println!(
+        "waiting for block date : {}.{}/{}.{}",
+        current_block_date.epoch(),
+        current_block_date.slot(),
+        target_block_date.epoch(),
+        target_block_date.slot()
+    );
+    current_block_date < target_block_date
+}
+
 pub fn get_current_date(rest: &mut JormungandrRest) -> BlockDate {
     BlockDate::from_str(
         rest.stats()

testing/jormungandr-testing-utils/src/wallet/mod.rs

@@ -11,7 +11,7 @@ use crate::{
 };
 use chain_addr::AddressReadable;
 use chain_addr::Discrimination;
-use chain_crypto::{Ed25519, Ed25519Extended, SecretKey, Signature};
+use chain_crypto::{Ed25519, Ed25519Extended, PublicKey, SecretKey, Signature};
 pub use chain_impl_mockchain::{
     account::SpendingCounter,
     block::Block,
@@ -191,6 +191,10 @@ impl Wallet {
         }
     }
 
+    pub fn public_key(&self) -> PublicKey<Ed25519> {
+        self.address().1.public_key().unwrap().clone()
+    }
+
     pub fn address_bech32(&self, discrimination: Discrimination) -> String {
         AddressReadable::from_address(&discrimination.into_prefix(), &self.address().into())
             .to_string()