fixups

solana-labs · Aug 2, 2018 · fbf58ee · fbf58ee
1 parent 8f95baa
commit fbf58ee
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 42 deletions.
diff --git a/src/drone.rs b/src/drone.rs
@@ -262,16 +262,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]

diff --git a/src/fullnode.rs b/src/fullnode.rs
@@ -384,16 +384,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]

diff --git a/src/ledger.rs b/src/ledger.rs
@@ -441,8 +441,6 @@ 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
@@ -297,16 +297,7 @@ mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     #[test]

diff --git a/src/tvu.rs b/src/tvu.rs
@@ -177,16 +177,7 @@ pub mod tests {
     fn tmp_ledger_path(name: &str) -> String {
         let keypair = KeyPair::new();
 
-        let id = {
-            let ids: Vec<_> = keypair
-                .pubkey()
-                .iter()
-                .map(|id| format!("{}", id))
-                .collect();
-            ids.join("")
-        };
-
-        format!("farf/{}-{}", name, id)
+        format!("farf/{}-{}", name, keypair.pubkey())
     }
 
     /// Test that message sent from leader to target1 and replicated to target2