Pretty manifest compiler error reporting

radix-clis/src/bin/replay.rs

@@ -1,9 +1,13 @@
 #[cfg(windows)]
 use colored::*;
+use radix_clis::error::exit_with_error;
 use radix_clis::replay;
 
-pub fn main() -> Result<(), replay::Error> {
+pub fn main() {
     #[cfg(windows)]
     control::set_virtual_terminal(true).unwrap();
-    replay::run()
+    match replay::run() {
+        Err(msg) => exit_with_error(msg, 1),
+        _ => {}
+    }
 }

radix-clis/src/bin/resim.rs

@@ -1,9 +1,13 @@
 #[cfg(windows)]
 use colored::*;
+use radix_clis::error::exit_with_error;
 use radix_clis::resim;
 
-pub fn main() -> Result<(), resim::Error> {
+pub fn main() {
     #[cfg(windows)]
     control::set_virtual_terminal(true).unwrap();
-    resim::run()
+    match resim::run() {
+        Err(msg) => exit_with_error(msg, 1),
+        _ => {}
+    }
 }

radix-clis/src/bin/rtmc.rs

@@ -1,9 +1,13 @@
 #[cfg(windows)]
 use colored::*;
+use radix_clis::error::exit_with_error;
 use radix_clis::rtmc;
 
-pub fn main() -> Result<(), rtmc::Error> {
+pub fn main() {
     #[cfg(windows)]
     control::set_virtual_terminal(true).unwrap();
-    rtmc::run()
+    match rtmc::run() {
+        Err(msg) => exit_with_error(msg, 1),
+        _ => {}
+    }
 }

radix-clis/src/bin/rtmd.rs

@@ -1,9 +1,13 @@
 #[cfg(windows)]
 use colored::*;
+use radix_clis::error::exit_with_error;
 use radix_clis::rtmd;
 
-pub fn main() -> Result<(), rtmd::Error> {
+pub fn main() {
     #[cfg(windows)]
     control::set_virtual_terminal(true).unwrap();
-    rtmd::run()
+    match rtmd::run() {
+        Err(msg) => exit_with_error(msg, 1),
+        _ => {}
+    }
 }

radix-clis/src/bin/scrypto.rs

@@ -1,9 +1,13 @@
 #[cfg(windows)]
 use colored::*;
+use radix_clis::error::exit_with_error;
 use radix_clis::scrypto;
 
-pub fn main() -> Result<(), scrypto::Error> {
+pub fn main() {
     #[cfg(windows)]
     control::set_virtual_terminal(true).unwrap();
-    scrypto::run()
+    match scrypto::run() {
+        Err(msg) => exit_with_error(msg, 1),
+        _ => {}
+    }
 }

radix-clis/src/error.rs

@@ -0,0 +1,4 @@
+pub fn exit_with_error(msg: String, exit_code: i32) {
+    eprintln!("{}", msg);
+    std::process::exit(exit_code)
+}

radix-clis/src/lib.rs

@@ -12,3 +12,5 @@ pub mod scrypto;
 pub mod scrypto_bindgen;
 /// Utility functions.
 pub mod utils;
+
+pub mod error;

radix-clis/src/replay/cmd_alloc_dump.rs

@@ -57,7 +57,7 @@ pub struct TxnAllocDump {
 }
 
 impl TxnAllocDump {
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&self) -> Result<(), String> {
         let network = match &self.network {
             Some(n) => NetworkDefinition::from_str(n).map_err(Error::ParseNetworkError)?,
             None => NetworkDefinition::mainnet(),
@@ -93,7 +93,7 @@ impl TxnAllocDump {
         } else if self.source.is_dir() {
             TxnReader::StateManagerDatabaseDir(self.source.clone())
         } else {
-            return Err(Error::InvalidTransactionSource);
+            return Err(Error::InvalidTransactionSource.into());
         };
         let txn_read_thread_handle =
             thread::spawn(move || txn_reader.read(cur_version, to_version, tx));

radix-clis/src/replay/cmd_execute.rs

@@ -38,7 +38,7 @@ pub struct TxnExecute {
 }
 
 impl TxnExecute {
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&self) -> Result<(), String> {
         let network = match &self.network {
             Some(n) => NetworkDefinition::from_str(n).map_err(Error::ParseNetworkError)?,
             None => NetworkDefinition::mainnet(),
@@ -66,7 +66,7 @@ impl TxnExecute {
         } else if self.source.is_dir() {
             TxnReader::StateManagerDatabaseDir(self.source.clone())
         } else {
-            return Err(Error::InvalidTransactionSource);
+            return Err(Error::InvalidTransactionSource.into());
         };
         let txn_read_thread_handle =
             thread::spawn(move || txn_reader.read(cur_version, to_version, tx));

radix-clis/src/replay/cmd_execute_in_memory.rs

@@ -41,7 +41,7 @@ pub struct TxnExecuteInMemory {
 }
 
 impl TxnExecuteInMemory {
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&self) -> Result<(), String> {
         let network = match &self.network {
             Some(n) => NetworkDefinition::from_str(n).map_err(Error::ParseNetworkError)?,
             None => NetworkDefinition::mainnet(),
@@ -58,7 +58,7 @@ impl TxnExecuteInMemory {
                         }
                     }
                 }
-                return Err(Error::InvalidBreakpoints(bps.clone()));
+                return Err(Error::InvalidBreakpoints(bps.clone()).into());
             }
         }
 
@@ -77,7 +77,7 @@ impl TxnExecuteInMemory {
         } else if self.source.is_dir() {
             TxnReader::StateManagerDatabaseDir(self.source.clone())
         } else {
-            return Err(Error::InvalidTransactionSource);
+            return Err(Error::InvalidTransactionSource.into());
         };
         let txn_read_thread_handle =
             thread::spawn(move || txn_reader.read(cur_version, to_version, tx));

radix-clis/src/replay/cmd_measure.rs

@@ -45,7 +45,7 @@ pub struct TxnMeasure {
 }
 
 impl TxnMeasure {
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&self) -> Result<(), String> {
         let network = match &self.network {
             Some(n) => NetworkDefinition::from_str(n).map_err(Error::ParseNetworkError)?,
             None => NetworkDefinition::mainnet(),
@@ -73,7 +73,7 @@ impl TxnMeasure {
         } else if self.source.is_dir() {
             TxnReader::StateManagerDatabaseDir(self.source.clone())
         } else {
-            return Err(Error::InvalidTransactionSource);
+            return Err(Error::InvalidTransactionSource.into());
         };
         let txn_read_thread_handle =
             thread::spawn(move || txn_reader.read(cur_version, to_version, tx));

radix-clis/src/replay/cmd_prepare.rs

@@ -26,7 +26,7 @@ pub struct TxnPrepare {
 const TRANSACTION_COLUMN: &str = "raw_ledger_transactions";
 
 impl TxnPrepare {
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&self) -> Result<(), String> {
         let temp_dir = tempfile::tempdir().map_err(Error::IOError)?;
         let db = DB::open_cf_as_secondary(
             &Options::default(),

radix-clis/src/replay/cmd_sync.rs

@@ -40,7 +40,7 @@ pub struct TxnSync {
 }
 
 impl TxnSync {
-    pub fn sync(&self) -> Result<(), Error> {
+    pub fn sync(&self) -> Result<(), String> {
         let network = match &self.network {
             Some(n) => NetworkDefinition::from_str(n).map_err(Error::ParseNetworkError)?,
             None => NetworkDefinition::mainnet(),

radix-clis/src/replay/error.rs

@@ -1,4 +1,5 @@
 use radix_common::prelude::ParseNetworkError;
+use std::fmt;
 
 #[derive(Debug)]
 pub enum Error {
@@ -9,3 +10,16 @@ pub enum Error {
     InvalidTransactionSource,
     InvalidBreakpoints(String),
 }
+
+impl fmt::Display for Error {
+    // TODO Implement pretty error printing
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
+impl From<Error> for String {
+    fn from(err: Error) -> String {
+        err.to_string()
+    }
+}

radix-clis/src/replay/mod.rs

@@ -38,7 +38,7 @@ pub enum Command {
     AllocDump(TxnAllocDump),
 }
 
-pub fn run() -> Result<(), Error> {
+pub fn run() -> Result<(), String> {
     let cli = ReplayCli::parse();
 
     match cli.command {

radix-clis/src/resim/cmd_call_function.rs

@@ -42,7 +42,7 @@ pub struct CallFunction {
 }
 
 impl CallFunction {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let address_bech32_decoder = AddressBech32Decoder::for_simulator();
 
         let default_account = get_default_account()?;

radix-clis/src/resim/cmd_call_method.rs

@@ -40,7 +40,7 @@ pub struct CallMethod {
 }
 
 impl CallMethod {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let address_bech32_decoder = AddressBech32Decoder::for_simulator();
 
         let default_account = get_default_account()?;

radix-clis/src/resim/cmd_export_package_definition.rs

@@ -18,7 +18,7 @@ pub struct ExportPackageDefinition {
 }
 
 impl ExportPackageDefinition {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         match export_package_schema(self.package_address.0) {
             Ok(schema) => {
                 fs::write(
@@ -34,7 +34,7 @@ impl ExportPackageDefinition {
                 .map_err(Error::IOError)?;
                 Ok(())
             }
-            Err(e) => Err(e),
+            Err(e) => Err(e.into()),
         }
     }
 }

radix-clis/src/resim/cmd_generate_key_pair.rs

@@ -9,7 +9,7 @@ use rand::Rng;
 pub struct GenerateKeyPair {}
 
 impl GenerateKeyPair {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let secret = rand::thread_rng().gen::<[u8; 32]>();
         let private_key = Secp256k1PrivateKey::from_bytes(&secret).unwrap();
         let public_key = private_key.public_key();

radix-clis/src/resim/cmd_mint.rs

@@ -35,7 +35,7 @@ pub struct Mint {
 }
 
 impl Mint {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let address_bech32_decoder = AddressBech32Decoder::for_simulator();
 
         let default_account = get_default_account()?;

radix-clis/src/resim/cmd_new_account.rs

@@ -31,7 +31,7 @@ pub struct NewAccount {
 struct EmptyStruct;
 
 impl NewAccount {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let secret = rand::thread_rng().gen::<[u8; 32]>();
         let private_key = Secp256k1PrivateKey::from_bytes(&secret).unwrap();
         let public_key = private_key.public_key();

radix-clis/src/resim/cmd_new_badge_fixed.rs

@@ -50,7 +50,7 @@ pub struct NewBadgeFixed {
 }
 
 impl NewBadgeFixed {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let default_account = get_default_account()?;
         let mut metadata = BTreeMap::new();
         if let Some(symbol) = self.symbol.clone() {

radix-clis/src/resim/cmd_new_badge_mutable.rs

@@ -50,7 +50,7 @@ pub struct NewBadgeMutable {
 }
 
 impl NewBadgeMutable {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let mut metadata = BTreeMap::new();
         if let Some(symbol) = self.symbol.clone() {
             metadata.insert("symbol".to_string(), MetadataValue::String(symbol));

radix-clis/src/resim/cmd_new_simple_badge.rs

@@ -54,7 +54,7 @@ impl NewSimpleBadge {
     pub fn run<O: std::io::Write>(
         &self,
         out: &mut O,
-    ) -> Result<Option<NonFungibleGlobalId>, Error> {
+    ) -> Result<Option<NonFungibleGlobalId>, String> {
         let network_definition = NetworkDefinition::simulator();
         let default_account = get_default_account()?;
         let mut metadata = MetadataInit::new();

radix-clis/src/resim/cmd_new_token_fixed.rs

@@ -50,7 +50,7 @@ pub struct NewTokenFixed {
 }
 
 impl NewTokenFixed {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let default_account = get_default_account()?;
         let mut metadata = BTreeMap::new();
         if let Some(symbol) = self.symbol.clone() {

radix-clis/src/resim/cmd_new_token_mutable.rs

@@ -49,7 +49,7 @@ pub struct NewTokenMutable {
 }
 
 impl NewTokenMutable {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         let mut metadata = BTreeMap::new();
         if let Some(symbol) = self.symbol.clone() {
             metadata.insert("symbol".to_string(), MetadataValue::String(symbol));

radix-clis/src/resim/cmd_publish.rs

@@ -59,7 +59,7 @@ pub struct Publish {
 }
 
 impl Publish {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         // Load wasm code
         let (code_path, definition_path) = if self.path.extension() != Some(OsStr::new("wasm")) {
             let build_artifacts = build_package(
@@ -71,7 +71,7 @@ impl Publish {
             )
             .map_err(Error::BuildError)?;
             if build_artifacts.len() > 1 {
-                return Err(Error::BuildError(BuildError::WorkspaceNotSupported));
+                return Err(Error::BuildError(BuildError::WorkspaceNotSupported).into());
             } else {
                 build_artifacts
                     .first()

radix-clis/src/resim/cmd_reset.rs

@@ -7,7 +7,7 @@ use crate::resim::*;
 pub struct Reset {}
 
 impl Reset {
-    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), Error> {
+    pub fn run<O: std::io::Write>(&self, out: &mut O) -> Result<(), String> {
         SimulatorEnvironment::new().and_then(|env| env.reset())?;
         writeln!(out, "Data directory cleared.").map_err(Error::IOError)?;
         Ok(())