From fe3d6f1fefe60881be54799584b217f22b1c85a4 Mon Sep 17 00:00:00 2001 From: Daniel Karzel Date: Mon, 22 Feb 2021 10:24:11 +1100 Subject: [PATCH] Rename nectar to asb (automated swap backend) --- .github/workflows/ci.yml | 6 +++--- swap/src/{nectar.rs => asb.rs} | 0 swap/src/{nectar => asb}/command.rs | 0 swap/src/{nectar => asb}/config.rs | 4 ++-- swap/src/bin/{nectar.rs => asb.rs} | 14 +++++++------- swap/src/lib.rs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename swap/src/{nectar.rs => asb.rs} (100%) rename swap/src/{nectar => asb}/command.rs (100%) rename swap/src/{nectar => asb}/config.rs (96%) rename swap/src/bin/{nectar.rs => asb.rs} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index caaffef1..34f8b0f5 100644 --- a/.github/workflows/ci.yml +++ b/.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: diff --git a/swap/src/nectar.rs b/swap/src/asb.rs similarity index 100% rename from swap/src/nectar.rs rename to swap/src/asb.rs diff --git a/swap/src/nectar/command.rs b/swap/src/asb/command.rs similarity index 100% rename from swap/src/nectar/command.rs rename to swap/src/asb/command.rs diff --git a/swap/src/nectar/config.rs b/swap/src/asb/config.rs similarity index 96% rename from swap/src/nectar/config.rs rename to swap/src/asb/config.rs index de3c8dd7..b97e3c9a 100644 --- a/swap/src/nectar/config.rs +++ b/swap/src/asb/config.rs @@ -104,7 +104,7 @@ where pub fn query_user_for_initial_testnet_config() -> Result { 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 { 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()?; diff --git a/swap/src/bin/nectar.rs b/swap/src/bin/asb.rs similarity index 99% rename from swap/src/bin/nectar.rs rename to swap/src/bin/asb.rs index f49f24c6..b3898bf2 100644 --- a/swap/src/bin/nectar.rs +++ b/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, diff --git a/swap/src/lib.rs b/swap/src/lib.rs index 77bd8b98..fbe5077b 100644 --- a/swap/src/lib.rs +++ b/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;