From cfa85e0badc05fc7310df332c6c9f43d58d47fcd Mon Sep 17 00:00:00 2001
From: Daniel Karzel <daniel@comit.network>
Date: Thu, 13 May 2021 13:56:40 +1000
Subject: [PATCH] Simplify ASB initial setup signature

---
 swap/src/asb/config.rs | 12 ++++--------
 swap/src/bin/asb.rs    |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/swap/src/asb/config.rs b/swap/src/asb/config.rs
index c27a04da..93926c3b 100644
--- a/swap/src/asb/config.rs
+++ b/swap/src/asb/config.rs
@@ -180,12 +180,8 @@ pub fn read_config(config_path: PathBuf) -> Result<Result<Config, ConfigNotIniti
     Ok(Ok(file))
 }
 
-pub fn initial_setup<F>(config_path: PathBuf, config_file: F, testnet: bool) -> Result<()>
-where
-    F: Fn(bool) -> Result<Config>,
-{
-    let initial_config = config_file(testnet)?;
-    let toml = toml::to_string(&initial_config)?;
+pub fn initial_setup(config_path: PathBuf, config: Config) -> Result<()> {
+    let toml = toml::to_string(&config)?;
 
     ensure_directory_exists(config_path.as_path())?;
     fs::write(&config_path, toml)?;
@@ -352,7 +348,7 @@ mod tests {
             },
         };
 
-        initial_setup(config_path.clone(), |_| Ok(expected.clone()), false).unwrap();
+        initial_setup(config_path.clone(), expected.clone()).unwrap();
         let actual = read_config(config_path).unwrap().unwrap();
 
         assert_eq!(expected, actual);
@@ -392,7 +388,7 @@ mod tests {
             },
         };
 
-        initial_setup(config_path.clone(), |_| Ok(expected.clone()), true).unwrap();
+        initial_setup(config_path.clone(), expected.clone()).unwrap();
         let actual = read_config(config_path).unwrap().unwrap();
 
         assert_eq!(expected, actual);
diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs
index d32ba3af..afef29f3 100644
--- a/swap/src/bin/asb.rs
+++ b/swap/src/bin/asb.rs
@@ -63,7 +63,7 @@ async fn main() -> Result<()> {
     let config = match read_config(config_path.clone())? {
         Ok(config) => config,
         Err(ConfigNotInitialized {}) => {
-            initial_setup(config_path.clone(), query_user_for_initial_config, testnet)?;
+            initial_setup(config_path.clone(), query_user_for_initial_config(testnet)?)?;
             read_config(config_path)?.expect("after initial setup config can be read")
         }
     };