fix: iterate on integration

Author: lgalabru

src/frontend/cli.rs

@@ -321,7 +321,10 @@ pub fn main() {
                 Err(e) => {
                     println!("{}", e);
                 }
-                Ok((session, _)) => {
+                Ok((session, _, output)) => {
+                    if let Some(message) = output {
+                        println!("{}", message);
+                    }
                     println!(
                         "{} Syntax of {} contract(s) successfully checked",
                         green!("✔"),
@@ -338,7 +341,12 @@ pub fn main() {
             let start_repl = false;
             let res = load_session(manifest_path.clone(), start_repl, &Network::Devnet);
             let session = match res {
-                Ok((session, _)) => session,
+                Ok((session, _, output)) => {
+                    if let Some(message) = output {
+                        println!("{}", message);
+                    }
+                    session
+                },
                 Err(e) => {
                     println!("{}", e);
                     return;
@@ -363,7 +371,12 @@ pub fn main() {
             let start_repl = false;
             let res = load_session(manifest_path.clone(), start_repl, &Network::Devnet);
             let session = match res {
-                Ok((session, _)) => session,
+                Ok((session, _, output)) => {
+                    if let Some(message) = output {
+                        println!("{}", message);
+                    }
+                    session
+                },
                 Err(e) => {
                     println!("{}", e);
                     return;

src/integrate/events_observer.rs

@@ -70,7 +70,7 @@ impl EventObserverConfig {
     pub fn new(devnet_config: DevnetConfig, manifest_path: PathBuf) -> Self {
         info!("Checking contracts...");
         let (session, config) = match load_session(manifest_path.clone(), false, &Network::Devnet) {
-            Ok((session, config)) => (session, config),
+            Ok((session, config, _)) => (session, config),
             Err(e) => {
                 println!("{}", e);
                 std::process::exit(1);
@@ -202,7 +202,7 @@ pub async fn start_events_observer(
                     .expect("Unable to terminate event observer");
 
                 let session = match load_session(manifest_path.clone(), false, &Network::Devnet) {
-                    Ok((session, _)) => session,
+                    Ok((session, _, _)) => session,
                     Err(e) => {
                         devnet_event_tx
                             .send(DevnetEvent::error(format!("Contracts invalid: {}", e)))

src/lib.rs

@@ -16,6 +16,7 @@ extern crate lazy_static;
 
 pub extern crate bip39;
 
+#[macro_use]
 pub mod macros;
 
 pub mod indexer;

src/poke/mod.rs

@@ -8,7 +8,7 @@ pub fn load_session(
     manifest_path: PathBuf,
     start_repl: bool,
     env: &Network,
-) -> Result<(repl::Session, ChainConfig), String> {
+) -> Result<(repl::Session, ChainConfig, Option<String>), String> {
     let mut settings = repl::SessionSettings::default();
 
     let mut project_path = manifest_path.clone();
@@ -106,20 +106,23 @@ pub fn load_session(
         settings.analysis = analysis_passes;
     }
 
-    let session = if start_repl {
+    let (session, output) = if start_repl {
         let mut terminal = Terminal::new(settings.clone());
         terminal.start();
-        terminal.session.clone()
+        (terminal.session.clone(), None)
     } else {
         let mut session = repl::Session::new(settings.clone());
-        match session.start() {
+        let output = match session.start() {
             Err(message) => {
                 println!("{}", message);
                 std::process::exit(1);
             }
-            _ => {}
+            Ok((message, _)) => match message.is_empty() {
+                true => None,
+                false => Some(message)
+            }
         };
-        session
+        (session, output)
     };
-    Ok((session, chain_config))
+    Ok((session, chain_config, output))
 }

src/publish/mod.rs

@@ -145,10 +145,22 @@ pub fn publish_all_contracts(
     network: Network,
 ) -> Result<Vec<String>, Vec<String>> {
     let start_repl = false;
-    let (session, chain) = match load_session(manifest_path, start_repl, &network) {
-        Ok((session, chain)) => (session, chain),
+    let (session, chain, output) = match load_session(manifest_path, start_repl, &network) {
+        Ok((session, chain, output)) => (session, chain, output),
         Err(e) => return Err(vec![e]),
     };
+
+    if let Some(message) = output {
+        println!("{}", message);
+        println!("{}", yellow!("Would you like to continue [Y/n]:"));
+        let mut buffer = String::new();
+        std::io::stdin().read_line(&mut buffer).unwrap();
+        if buffer == "n\n" {
+            println!("{}", red!("Contracts deployment aborted"));
+            std::process::exit(1);
+        }
+    }
+
     let mut results = vec![];
     let mut deployers_nonces = BTreeMap::new();
     let mut deployers_lookup = BTreeMap::new();