From 32a978d93242537815a2d5b637d1fbfe665c0cbd Mon Sep 17 00:00:00 2001
From: Jedrzej Stuczynski <jedrzej.stuczynski@gmail.com>
Date: Mon, 20 Jan 2020 10:32:07 +0000
Subject: [PATCH] Removed call to 'banner' from external modules

---
 nym-client/src/commands/init.rs      |  2 --
 nym-client/src/commands/tcpsocket.rs |  3 ---
 nym-client/src/commands/websocket.rs |  3 ---
 nym-client/src/main.rs               | 15 ++++++++++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nym-client/src/commands/init.rs b/nym-client/src/commands/init.rs
index ce6ee879b4..f6d675ea02 100644
--- a/nym-client/src/commands/init.rs
+++ b/nym-client/src/commands/init.rs
@@ -1,11 +1,9 @@
-use crate::banner;
 use crate::persistence::pathfinder::Pathfinder;
 use crate::persistence::pemstore::PemStore;
 use clap::ArgMatches;
 use crypto::identity::MixnetIdentityKeyPair;
 
 pub fn execute(matches: &ArgMatches) {
-    println!("{}", banner());
     println!("Initialising client...");
 
     let id = matches.value_of("id").unwrap().to_string(); // required for now
diff --git a/nym-client/src/commands/tcpsocket.rs b/nym-client/src/commands/tcpsocket.rs
index 97b258101e..3ed3662c7b 100644
--- a/nym-client/src/commands/tcpsocket.rs
+++ b/nym-client/src/commands/tcpsocket.rs
@@ -1,4 +1,3 @@
-use crate::banner;
 use crate::clients::{NymClient, SocketType};
 use crate::persistence::pemstore;
 
@@ -7,8 +6,6 @@ use crypto::identity::{MixnetIdentityKeyPair, MixnetIdentityPublicKey};
 use std::net::ToSocketAddrs;
 
 pub fn execute(matches: &ArgMatches) {
-    println!("{}", banner());
-
     let id = matches.value_of("id").unwrap().to_string();
     let port = match matches.value_of("port").unwrap_or("9001").parse::<u16>() {
         Ok(n) => n,
diff --git a/nym-client/src/commands/websocket.rs b/nym-client/src/commands/websocket.rs
index 4b27bc3455..99dbc1ecc6 100644
--- a/nym-client/src/commands/websocket.rs
+++ b/nym-client/src/commands/websocket.rs
@@ -1,4 +1,3 @@
-use crate::banner;
 use crate::clients::{NymClient, SocketType};
 use crate::persistence::pemstore;
 
@@ -7,8 +6,6 @@ use crypto::identity::{MixnetIdentityKeyPair, MixnetIdentityPublicKey};
 use std::net::ToSocketAddrs;
 
 pub fn execute(matches: &ArgMatches) {
-    println!("{}", banner());
-
     let id = matches.value_of("id").unwrap().to_string();
     let port = match matches.value_of("port").unwrap_or("9001").parse::<u16>() {
         Ok(n) => n,
diff --git a/nym-client/src/main.rs b/nym-client/src/main.rs
index 0e4e7f96fc..7cede69284 100644
--- a/nym-client/src/main.rs
+++ b/nym-client/src/main.rs
@@ -91,9 +91,18 @@ fn main() {
 
 fn execute(matches: ArgMatches) -> Result<(), String> {
     match matches.subcommand() {
-        ("init", Some(m)) => Ok(commands::init::execute(m)),
-        ("tcpsocket", Some(m)) => Ok(commands::tcpsocket::execute(m)),
-        ("websocket", Some(m)) => Ok(commands::websocket::execute(m)),
+        ("init", Some(m)) => {
+            println!("{}", banner());
+            Ok(commands::init::execute(m))
+        }
+        ("tcpsocket", Some(m)) => {
+            println!("{}", banner());
+            Ok(commands::tcpsocket::execute(m))
+        }
+        ("websocket", Some(m)) => {
+            println!("{}", banner());
+            Ok(commands::websocket::execute(m))
+        }
         _ => Err(usage()),
     }
 }