Error handling

README.md

@@ -39,6 +39,7 @@ setup params, and compile the source code.
 
 ```shell
 % git clone https://github.com/darkrenaissance/darkfi
+% cd darkfi/
 % make
 ```
 

src/client.rs

@@ -44,7 +44,7 @@ pub enum ClientFailed {
     DoesNotHaveKeypair,
     #[error("Password is empty. Cannot create database")]
     EmptyPassword,
-    #[error("Wallet already initalized")]
+    #[error("Wallet already initialized")]
     WalletInitialized,
     #[error("Keypair already exists")]
     KeyExists,

src/rpc/jsonrpc.rs

@@ -143,9 +143,13 @@ pub async fn send_raw_request(url: &str, data: Value) -> Result<JsonResult, Erro
         }
     }
 
-    // TODO: Error handling
-    let host = parsed_url.host().unwrap().to_string();
-    let port = parsed_url.port().unwrap();
+    let host = parsed_url
+        .host()
+        .ok_or_else(|| Error::UrlParseError(format!("Missing host in {}", url)))?
+        .to_string();
+    let port = parsed_url
+        .port()
+        .ok_or_else(|| Error::UrlParseError(format!("Missing port in {}", url)))?;
 
     let socket_addr = {
         let host = host.clone();

src/state.rs

@@ -14,7 +14,7 @@ use crate::{
     },
     tx::Transaction,
     wallet::walletdb::WalletPtr,
-    Result,
+    Result, error,
 };
 
 pub trait ProgramState {
@@ -53,6 +53,14 @@ pub enum VerifyFailed {
     MissingFunds,
     #[error("Assets don't match some inputs or outputs (token commits)")]
     AssetMismatch,
+    #[error("Inetrnal error: {0}")]
+    InternalError(String),
+}
+
+impl From<error::Error> for VerifyFailed {
+    fn from(err: error::Error) -> Self {
+        VerifyFailed::InternalError(err.to_string())
+    }
 }
 
 pub fn state_transition<S: ProgramState>(state: &S, tx: Transaction) -> VerifyResult<StateUpdate> {

src/tx/mod.rs

@@ -125,7 +125,7 @@ impl Transaction {
 
         // Verify signatures
         let mut unsigned_tx_data = vec![];
-        self.encode_without_signature(&mut unsigned_tx_data).expect("TODO handle this");
+        self.encode_without_signature(&mut unsigned_tx_data)?;
         for (i, input) in self.clear_inputs.iter().enumerate() {
             let public = &input.signature_public;
             if !public.verify(&unsigned_tx_data[..], &input.signature) {