genesis: factor out a reusable verify_genesis function

SkarioT · Jun 8, 2021 · f65ebdb · f65ebdb
1 parent 5efe4e6
commit f65ebdb
Showing 1 changed file with 30 additions and 22 deletions.
diff --git a/config/management/genesis/src/verify.rs b/config/management/genesis/src/verify.rs
@@ -52,36 +52,44 @@ impl Verify {
             .load()?
             .override_validator_backend(&self.backend.validator_backend)?;
         let validator_storage = config.validator_backend();
-        let mut buffer = String::new();
 
-        writeln!(buffer, "Data stored in SecureStorage:").unwrap();
-        write_break(&mut buffer);
-        writeln!(buffer, "Keys").unwrap();
-        write_break(&mut buffer);
+        verify_genesis(validator_storage, self.genesis_path.as_deref())
+    }
+}
 
-        write_ed25519_key(&validator_storage, &mut buffer, CONSENSUS_KEY);
-        write_x25519_key(&validator_storage, &mut buffer, FULLNODE_NETWORK_KEY);
-        write_ed25519_key(&validator_storage, &mut buffer, OWNER_KEY);
-        write_ed25519_key(&validator_storage, &mut buffer, OPERATOR_KEY);
-        write_ed25519_key(&validator_storage, &mut buffer, VALIDATOR_NETWORK_KEY);
+pub fn verify_genesis(
+    validator_storage: Storage,
+    genesis_path: Option<&Path>,
+) -> Result<String, Error> {
+    let mut buffer = String::new();
 
-        write_break(&mut buffer);
-        writeln!(buffer, "Data").unwrap();
-        write_break(&mut buffer);
+    writeln!(buffer, "Data stored in SecureStorage:").unwrap();
+    write_break(&mut buffer);
+    writeln!(buffer, "Keys").unwrap();
+    write_break(&mut buffer);
 
-        write_string(&validator_storage, &mut buffer, OPERATOR_ACCOUNT);
-        write_string(&validator_storage, &mut buffer, OWNER_ACCOUNT);
-        write_safety_data(&validator_storage, &mut buffer, SAFETY_DATA);
-        write_waypoint(&validator_storage, &mut buffer, WAYPOINT);
+    write_ed25519_key(&validator_storage, &mut buffer, CONSENSUS_KEY);
+    write_x25519_key(&validator_storage, &mut buffer, FULLNODE_NETWORK_KEY);
+    write_ed25519_key(&validator_storage, &mut buffer, OWNER_KEY);
+    write_ed25519_key(&validator_storage, &mut buffer, OPERATOR_KEY);
+    write_ed25519_key(&validator_storage, &mut buffer, VALIDATOR_NETWORK_KEY);
 
-        write_break(&mut buffer);
+    write_break(&mut buffer);
+    writeln!(buffer, "Data").unwrap();
+    write_break(&mut buffer);
 
-        if let Some(genesis_path) = self.genesis_path.as_ref() {
-            compare_genesis(validator_storage, &mut buffer, genesis_path)?;
-        }
+    write_string(&validator_storage, &mut buffer, OPERATOR_ACCOUNT);
+    write_string(&validator_storage, &mut buffer, OWNER_ACCOUNT);
+    write_safety_data(&validator_storage, &mut buffer, SAFETY_DATA);
+    write_waypoint(&validator_storage, &mut buffer, WAYPOINT);
 
-        Ok(buffer)
+    write_break(&mut buffer);
+
+    if let Some(genesis_path) = genesis_path {
+        compare_genesis(validator_storage, &mut buffer, genesis_path)?;
     }
+
+    Ok(buffer)
 }
 
 fn write_assert(buffer: &mut String, name: &str, value: bool) {