diff --git a/src/drone.rs b/src/drone.rs index be1d3ea3ae..ce5a69cb6f 100644 --- a/src/drone.rs +++ b/src/drone.rs @@ -262,7 +262,16 @@ mod tests { fn tmp_ledger_path(name: &str) -> String { let keypair = KeyPair::new(); - format!("farf/{}-{}", name, keypair.pubkey()) + let id = { + let ids: Vec<_> = keypair + .pubkey() + .iter() + .map(|id| format!("{}", id)) + .collect(); + ids.join("") + }; + + format!("farf/{}-{}", name, id) } #[test] diff --git a/src/fullnode.rs b/src/fullnode.rs index e046cb3c87..fe45f68147 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -384,7 +384,16 @@ mod tests { fn tmp_ledger_path(name: &str) -> String { let keypair = KeyPair::new(); - format!("farf/{}-{}", name, keypair.pubkey()) + let id = { + let ids: Vec<_> = keypair + .pubkey() + .iter() + .map(|id| format!("{}", id)) + .collect(); + ids.join("") + }; + + format!("farf/{}-{}", name, id) } #[test] diff --git a/src/ledger.rs b/src/ledger.rs index abd63a182c..10ad25d120 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -39,6 +39,10 @@ fn entry_at(file: &mut File, at: u64) -> io::Result { deserialize_from(file.take(len)).map_err(err_bincode_to_io) } +//fn next_offset(file: &mut File) -> io::Result { +// deserialize_from(file.take(SIZEOF_U64)).map_err(err_bincode_to_io) +//} + fn next_entry(file: &mut File) -> io::Result { let len = deserialize_from(file.take(SIZEOF_USIZE)).map_err(err_bincode_to_io)?; deserialize_from(file.take(len)).map_err(err_bincode_to_io) @@ -437,6 +441,8 @@ mod tests { assert!(entries0.verify(&id)); } + fn tmp_ledger_path() -> String {} + #[test] fn test_ledger_reader_writer() { let ledger_path = tmp_ledger_path("test_ledger_reader_writer"); diff --git a/src/thin_client.rs b/src/thin_client.rs index d5bee03b75..df2bf47493 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -297,7 +297,16 @@ mod tests { fn tmp_ledger_path(name: &str) -> String { let keypair = KeyPair::new(); - format!("farf/{}-{}", name, keypair.pubkey()) + let id = { + let ids: Vec<_> = keypair + .pubkey() + .iter() + .map(|id| format!("{}", id)) + .collect(); + ids.join("") + }; + + format!("farf/{}-{}", name, id) } #[test] diff --git a/src/tvu.rs b/src/tvu.rs index a2cb8869ef..a3e96d631f 100644 --- a/src/tvu.rs +++ b/src/tvu.rs @@ -177,7 +177,16 @@ pub mod tests { fn tmp_ledger_path(name: &str) -> String { let keypair = KeyPair::new(); - format!("farf/{}-{}", name, keypair.pubkey()) + let id = { + let ids: Vec<_> = keypair + .pubkey() + .iter() + .map(|id| format!("{}", id)) + .collect(); + ids.join("") + }; + + format!("farf/{}-{}", name, id) } /// Test that message sent from leader to target1 and replicated to target2