Minor changes

client.js

@@ -70,10 +70,11 @@ async function settle(id) {
 }
 
 async function test() {
-	const d = (await deposit(addr1, 100, "BTC"));
-	console.log(d);
-	console.log(await settle(d.id));
-	//console.log(await trade(10, "BTC", addr1, addr2))
+	//const d = (await deposit(addr1, 100, "BTC"));
+	//console.log(d);
+	//console.log(await settle(d.id));
+	const t = await trade(10, "BTC", addr1, addr2);
+	console.log(await settle(t.id));
 }
 
 test()

src/main.rs

@@ -4,6 +4,7 @@ use actix_web::{
 };
 use ledger_utxo::{AccountId, AnyId, AssetDefinition, AssetManager, Status, TransactionId};
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use std::sync::Arc;
 
 #[derive(Deserialize)]
@@ -123,10 +124,11 @@ async fn get_balance(info: web::Path<AccountId>, ledger: web::Data<Ledger>) -> i
                 .collect::<Result<Vec<_>, _>>()
             {
                 Ok(balances) => HttpResponse::Ok().json(balances),
-                Err(e) => HttpResponse::BadRequest().json(e),
+                Err(err) => HttpResponse::InternalServerError()
+                    .json(json!({ "text": err.to_string(), "err": err})),
             }
         }
-        Err(e) => HttpResponse::BadRequest().json(e),
+        Err(err) => HttpResponse::BadRequest().json(json!({ "text": err.to_string(), "err": err})),
     }
 }
 
@@ -147,7 +149,9 @@ async fn get_info(info: web::Path<AnyId>, ledger: web::Data<Ledger>) -> impl Res
 
     match result {
         Ok(x) => x,
-        Err(err) => HttpResponse::InternalServerError().json(err),
+        Err(err) => {
+            HttpResponse::InternalServerError().json(json!({ "text": err.to_string(), "err": err}))
+        }
     }
 }
 
@@ -161,7 +165,7 @@ async fn deposit(item: web::Json<Deposit>, ledger: web::Data<Ledger>) -> impl Re
             // For this example, we'll just echo the received item.
             HttpResponse::Created().json(tx)
         }
-        Err(e) => HttpResponse::Created().json(e),
+        Err(err) => HttpResponse::BadRequest().json(json!({ "text": err.to_string(), "err": err})),
     }
 }
 
@@ -172,7 +176,9 @@ async fn create_transaction(
 ) -> impl Responder {
     match item.into_inner().to_ledger_transaction(&ledger).await {
         Ok(tx) => HttpResponse::Accepted().json(tx),
-        Err(err) => HttpResponse::Created().json(err),
+        Err(err) => {
+            HttpResponse::InternalServerError().json(json!({ "text": err.to_string(), "err": err}))
+        }
     }
 }
 
@@ -188,7 +194,9 @@ async fn update_status(
         .await
     {
         Ok(tx) => HttpResponse::Accepted().json(tx),
-        Err(err) => HttpResponse::Created().json(err),
+        Err(err) => {
+            HttpResponse::InternalServerError().json(json!({ "text": err.to_string(), "err": err}))
+        }
     }
 }
 

utxo/src/changelog.rs

@@ -26,7 +26,7 @@ pub struct Changelog<T: DeserializeOwned + Serialize + Send + Sync> {
     #[serde(flatten)]
     pub change: T,
     #[serde(with = "ts_milliseconds")]
-    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
 }
 
 impl<T: DeserializeOwned + Serialize + Send + Sync> Changelog<T> {
@@ -35,7 +35,7 @@ impl<T: DeserializeOwned + Serialize + Send + Sync> Changelog<T> {
             previous,
             object_id,
             change,
-            created_at: Utc::now(),
+            updated_at: Utc::now(),
         }
     }
 
@@ -49,7 +49,7 @@ impl<T: DeserializeOwned + Serialize + Send + Sync> Changelog<T> {
             previous,
             object_id,
             change,
-            created_at,
+            updated_at: created_at,
         }
     }
 
@@ -62,7 +62,7 @@ impl<T: DeserializeOwned + Serialize + Send + Sync> Changelog<T> {
             vec![0, 0]
         });
         hasher.update(&bincode::serialize(&self.change)?);
-        hasher.update(&bincode::serialize(&self.created_at)?);
+        hasher.update(&bincode::serialize(&self.updated_at)?);
         Ok(hasher.finalize().to_vec())
     }
 }
@@ -76,8 +76,6 @@ pub fn sort_changes<T: DeserializeOwned + Serialize + Send + Sync>(
         .map(|a| a.id().map(|id| (id, a)))
         .collect::<Result<HashMap<Vec<u8>, Changelog<T>>, _>>()?;
 
-    println!("changes_by_id: {:?}", changes_by_id.keys());
-
     let mut sorted_changes = VecDeque::new();
 
     let last_change = match changes_by_id.remove(&last_change) {

utxo/src/sqlite/batch.rs

@@ -57,7 +57,7 @@ impl<'a> storage::Batch<'a> for Batch<'a> {
             .bind(&change.previous)
             .bind(&change.object_id)
             .bind(change_bytes)
-            .bind(change.created_at)
+            .bind(change.updated_at)
             .execute(&mut *self.inner)
             .await
             .map_err(|e| Error::Storage(e.to_string()))?;