crates/icepick-workflow/src/lib.rs

@@ -1,7 +1,7 @@
 use keyfork_derive_util::{request::DerivationAlgorithm, DerivationIndex, DerivationPath};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::collections::{BTreeMap, HashSet};
+use std::collections::{HashMap, HashSet};
 
 #[derive(thiserror::Error, Debug)]
 pub enum SimulationError {
@@ -38,7 +38,7 @@ pub struct Workflow {
     steps: Vec<WorkflowStep>,
 }
 
-pub type StringMap<T = String> = BTreeMap<String, T>;
+pub type StringMap = HashMap<String, String>;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct WorkflowStep {
@@ -60,7 +60,7 @@ pub struct WorkflowStep {
 #[derive(Serialize, Deserialize)]
 pub struct OperationResult {
     // All values returned from an operation.
-    blob: StringMap<Value>,
+    blob: HashMap<String, Value>,
 
     // Any requested accounts from an operation.
     //
@@ -115,10 +115,10 @@ impl Workflow {
 
     pub fn run_workflow<T: InvocableOperation>(
         &self,
-        mut data: StringMap<Value>,
+        mut data: HashMap<String, Value>,
         operations: &[T],
         derive_keys: DeriveKeys,
-    ) -> Result<StringMap<Value>, WorkflowError> {
+    ) -> Result<HashMap<String, Value>, WorkflowError> {
         let mut derived_keys = vec![];
         let mut derivation_accounts = vec![];
 
@@ -138,7 +138,7 @@ impl Workflow {
             derivation_accounts.clear();
 
             // Prepare all inputs for the operation invocation
-            let inputs: StringMap<Value> = data
+            let inputs: HashMap<String, Value> = data
                 .iter()
                 .map(|(k, v)| (k, v.clone()))
                 .filter_map(|(k, v)| {
@@ -192,7 +192,7 @@ pub trait WorkflowHandler {
 /// within themselves.
 pub trait InvocableOperation {
     /// Invoke the operation with the supplied inputs and derived keys.
-    fn invoke(&self, input: &StringMap<Value>, derived_keys: &[Vec<u8>]) -> OperationResult;
+    fn invoke(&self, input: &HashMap<String, Value>, derived_keys: &[Vec<u8>]) -> OperationResult;
 
     /// The name of the operation.
     fn name(&self) -> &String;

crates/icepick/build.rs

@@ -39,8 +39,6 @@ fn main() {
             workflows.push(workflow);
         }
 
-        workflows.sort_by(|a, b| a.name.cmp(&b.name));
-
         workflows_by_module.insert(
             module_dir.file_name().to_str().unwrap().to_owned(),
             workflows,

crates/icepick/src/cli/mod.rs

@@ -3,7 +3,7 @@ use icepick_module::help::*;
 use keyfork_derive_util::{request::DerivationAlgorithm, DerivationIndex, DerivationPath};
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::{HashMap, BTreeMap},
+    collections::HashMap,
     io::{IsTerminal, Write},
     path::PathBuf,
     process::{Command, Stdio},
@@ -126,7 +126,7 @@ pub fn do_cli_thing() {
         }
         None
     });
-    let config_path = config_file.unwrap_or_else(|| "/etc/icepick/icepick.toml".to_string());
+    let config_path = config_file.unwrap_or_else(|| "icepick.toml".to_string());
     let config_content = std::fs::read_to_string(config_path).expect("can't read config file");
     let mut config: Config = match toml::from_str(&config_content) {
         Ok(config) => config,
@@ -368,7 +368,7 @@ pub fn do_cli_thing() {
                 }
             };
 
-            let inputs: BTreeMap<String, serde_json::Value> =
+            let inputs: HashMap<String, serde_json::Value> =
                 serde_json::from_value(inputs).unwrap();
 
             let workflow = workflows

crates/icepick/src/cli/workflow.rs

@@ -1,9 +1,10 @@
-use icepick_workflow::{InvocableOperation, OperationResult, Workflow, StringMap};
+use icepick_workflow::{InvocableOperation, OperationResult, Workflow};
 use keyfork_derive_util::{request::DerivationAlgorithm, DerivationPath};
 use keyfork_shard::{openpgp::OpenPGP, Format};
 use miniquorum::{Payload, PayloadVerification};
 use serde_json::Value;
 use std::{
+    collections::HashMap,
     io::Write,
     process::{Command, Stdio},
 };
@@ -19,6 +20,8 @@ pub enum Purpose {
     RunQuorum,
 }
 
+pub type StringMap = std::collections::HashMap<String, String>;
+
 #[derive(Clone, Debug)]
 struct CLIOperation {
     /// The name of the operation (i.e. `transfer-token`).
@@ -38,7 +41,7 @@ struct CLIOperation {
 }
 
 impl InvocableOperation for CLIOperation {
-    fn invoke(&self, input: &StringMap<Value>, derived_keys: &[Vec<u8>]) -> OperationResult {
+    fn invoke(&self, input: &HashMap<String, Value>, derived_keys: &[Vec<u8>]) -> OperationResult {
         let (command, args) = get_command(&self.binary);
 
         let json = serde_json::json!({
@@ -233,7 +236,7 @@ pub fn parse_quorum_with_shardfile(
 
 pub fn handle_payload(
     workflow: &Workflow,
-    inputs: StringMap<Value>,
+    inputs: HashMap<String, Value>,
     modules: Commands,
     config: &[ModuleConfig],
 ) {
@@ -252,7 +255,7 @@ pub fn handle(
     config: &[ModuleConfig],
 ) {
     let inputs = load_inputs(&workflow.inputs, &workflow.optional_inputs, matches);
-    let data: StringMap<Value> = inputs
+    let data: HashMap<String, Value> = inputs
         .into_iter()
         .map(|(k, v)| (k, Value::String(v)))
         .collect();