Merge #214

214: Rename nectar to asb (automated swap backend) r=da-kami a=da-kami



Co-authored-by: Daniel Karzel <daniel@comit.network>

.github/workflows/ci.yml

@@ -74,11 +74,11 @@ jobs:
           name: swap-${{ matrix.target }}
           path: target/${{ matrix.target }}/debug/swap_cli
 
-      - name: Upload nectar binary
+      - name: Upload asb binary
         uses: actions/upload-artifact@v2-preview
         with:
-          name: nectar-${{ matrix.target }}
-          path: target/${{ matrix.target }}/debug/nectar
+          name: asb-${{ matrix.target }}
+          path: target/${{ matrix.target }}/debug/asb
 
   test:
     env:

swap/src/asb/config.rs

@@ -104,7 +104,7 @@ where
 pub fn query_user_for_initial_testnet_config() -> Result<Config> {
     println!();
     let data_dir = Input::with_theme(&ColorfulTheme::default())
-        .with_prompt("Enter data directory for nectar or hit return to use default")
+        .with_prompt("Enter data directory for asb or hit return to use default")
         .default(
             default_data_dir()
                 .context("No default data dir value for this system")?
@@ -116,7 +116,7 @@ pub fn query_user_for_initial_testnet_config() -> Result<Config> {
     let data_dir = data_dir.as_str().parse()?;
 
     let listen_address = Input::with_theme(&ColorfulTheme::default())
-        .with_prompt("Enter multiaddress on which nectar should list for peer-to-peer communications or hit return to use default")
+        .with_prompt("Enter multiaddress on which asb should list for peer-to-peer communications or hit return to use default")
         .default(DEFAULT_LISTEN_ADDRESS.to_owned())
         .interact_text()?;
     let listen_address = listen_address.as_str().parse()?;

swap/src/bin/asb.rs

@@ -18,6 +18,13 @@ use prettytable::{row, Table};
 use std::{path::Path, sync::Arc};
 use structopt::StructOpt;
 use swap::{
+    asb::{
+        command::{Arguments, Command},
+        config::{
+            initial_setup, query_user_for_initial_testnet_config, read_config, Config,
+            ConfigNotInitialized,
+        },
+    },
     bitcoin,
     database::Database,
     execution_params,
@@ -25,13 +32,6 @@ use swap::{
     fs::default_config_path,
     monero,
     monero::{CreateWallet, OpenWallet},
-    nectar::{
-        command::{Arguments, Command},
-        config::{
-            initial_setup, query_user_for_initial_testnet_config, read_config, Config,
-            ConfigNotInitialized,
-        },
-    },
     protocol::alice::EventLoop,
     seed::Seed,
     trace::init_tracing,

swap/src/lib.rs

@@ -16,13 +16,13 @@
     missing_copy_implementations
 )]
 
+pub mod asb;
 pub mod bitcoin;
 pub mod cli;
 pub mod database;
 pub mod execution_params;
 pub mod fs;
 pub mod monero;
-pub mod nectar;
 pub mod protocol;
 pub mod seed;
 pub mod trace;