Clean up

.sync.sh

@@ -5,7 +5,7 @@ COMMAND='cargo run --release -- --sync --trial'
 function exit_node()
 {
     echo "Exiting..."
-    kill -INT $!
+    kill $!
     exit
 }
 

run-client.sh

@@ -5,7 +5,7 @@ COMMAND='cargo run --release -- --trial --verbosity 2'
 function exit_node()
 {
     echo "Exiting..."
-    kill -INT $!
+    kill $!
     exit
 }
 

run-miner.sh

@@ -13,7 +13,7 @@ COMMAND="cargo run --release -- --miner ${MINER_ADDRESS} --trial --verbosity 2"
 function exit_node()
 {
     echo "Exiting..."
-    kill -INT $!
+    kill $!
     exit
 }
 

src/display/aleo.rs

@@ -37,3 +37,27 @@ pub fn welcome_message() -> String {
     output += &"Welcome to Aleo! We thank you for running a network node and supporting privacy.\n".bold();
     output
 }
+
+pub fn notification_message() -> String {
+    let mut output = String::new();
+    output += &r#"
+
+ =================================================================================================
+                               Aleo Testnet2 - Incentivization Period
+ =================================================================================================
+
+     The incentivized testnet is about to begin:
+         1. Generate one Aleo account, and save the account private key and view key.
+         2. Ensure your Aleo node is running the `run-client.sh` or `run-miner.sh` script,
+            in order to automatically stay up to date on the incentivized testnet.
+         3. File all issues on Github at https://github.com/AleoHQ/snarkOS/issues/new/choose
+         4. Please be respectful to all members of the Aleo community.
+
+     Thank you for participating in the incentivized testnet and for supporting privacy!
+
+ =================================================================================================
+"#
+    .white()
+    .bold();
+    output
+}

src/network/server.rs

@@ -15,6 +15,7 @@
 // along with the snarkOS library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
+    display::notification_message,
     helpers::{State, Status, Tasks},
     ledger::{Ledger, LedgerRequest, LedgerRouter},
     peers::{Peers, PeersRequest, PeersRouter},
@@ -306,25 +307,7 @@ impl<N: Network, E: Environment> Server<N, E> {
             // Notify the outer function that the task is ready.
             let _ = router.send(());
             loop {
-                info!(
-                    r"
-
- =========================================================================================================
-                                   Aleo Testnet2 - Incentivization Period
- =========================================================================================================
-
-     The incentivized testnet is about to begin:
-         1. Generate one Aleo account, and save the account private key and view key.
-         2. Ensure your Aleo node is running the `run-client.sh` or `run-miner.sh` script,
-            in order to automatically stay up to date on the incentivized testnet.
-         3. File all issues on Github at https://github.com/AleoHQ/snarkOS/issues/new/choose
-         4. Please be respectful to all members of the Aleo community.
-
-     Thank you for participating in the incentivized testnet and for supporting privacy!
-
- =========================================================================================================
-                "
-                );
+                info!("{}", notification_message());
 
                 if E::NODE_TYPE == NodeType::Miner {
                     if let Some(miner) = miner {

src/node.rs

@@ -133,11 +133,13 @@ impl Node {
                 println!("{}", crate::display::welcome_message());
                 println!("Your Aleo address is {}.\n", miner_address);
                 println!("Starting a mining node on {}.\n", N::NETWORK_NAME);
+                println!("{}", crate::display::notification_message());
                 Some(miner_address)
             }
             _ => {
                 println!("{}", crate::display::welcome_message());
                 println!("Starting a client node on {}.\n", N::NETWORK_NAME);
+                println!("{}", crate::display::notification_message());
                 None
             }
         };