AmbireTech
diff --git a/‎Cargo.lock
Lines changed: 1 addition & 0 deletions b/‎Cargo.lock
Lines changed: 1 addition & 0 deletions
diff --git a/‎adapter/src/ethereum.rs
Lines changed: 1 addition & 3 deletions b/‎adapter/src/ethereum.rs
Lines changed: 1 addition & 3 deletions
diff --git a/‎primitives/Cargo.toml
Lines changed: 3 additions & 1 deletion b/‎primitives/Cargo.toml
Lines changed: 3 additions & 1 deletion
diff --git a/‎primitives/src/channel.rs
Lines changed: 15 additions & 0 deletions b/‎primitives/src/channel.rs
Lines changed: 15 additions & 0 deletions
diff --git a/‎sentry/src/chain.rs
Lines changed: 33 additions & 0 deletions b/‎sentry/src/chain.rs
Lines changed: 33 additions & 0 deletions
diff --git a/‎sentry/src/event_reducer.rs
Lines changed: 1 addition & 1 deletion b/‎sentry/src/event_reducer.rs
Lines changed: 1 addition & 1 deletion
@@ -380,9 +380,7 @@ mod test {
     #[test]
     fn should_init_and_unlock_ethereum_adapter() {
         let mut eth_adapter = setup_eth_adapter();
-        let unlock = eth_adapter.unlock().expect("should unlock eth adapter");
-
-        assert_eq!((), unlock, "failed to unlock eth adapter");
+        eth_adapter.unlock().expect("should unlock eth adapter");
     }
 
     #[test]
 
@@ -5,7 +5,7 @@ authors = ["Lachezar Lechev <[email protected]>, Omidiora Samuel <[email protected]
 edition = "2018"
 
 [features]
-postgres = ["postgres-types", "bytes"]
+postgres = ["postgres-types", "bytes", "tokio-postgres"]
 
 [dependencies]
 # Futures
@@ -39,5 +39,7 @@ rand = { version = "^0.6" }
 # postgres feature
 postgres-types = {version = "0.1.0-alpha.1", optional = true}
 bytes = { version = "0.4.12", optional = true}
+tokio-postgres = {version = "0.5.0-alpha.1", optional = true, features = ["with-chrono-0_4", "with-serde_json-1"]}
+
 # Other
 lazy_static = "1.4.0"
@@ -197,10 +197,12 @@ impl Error for ChannelError {
 #[cfg(feature = "postgres")]
 pub mod postgres {
     use super::ChannelId;
+    use super::{Channel, ChannelSpec};
     use bytes::BytesMut;
     use hex::FromHex;
     use postgres_types::{FromSql, IsNull, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::{types::Json, Row};
 
     impl<'a> FromSql<'a> for ChannelId {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
@@ -217,6 +219,19 @@ pub mod postgres {
         }
     }
 
+    impl From<&Row> for Channel {
+        fn from(row: &Row) -> Self {
+            Self {
+                id: row.get("channel_id"),
+                creator: row.get("creator"),
+                deposit_asset: row.get("deposit_asset"),
+                deposit_amount: row.get("deposit_amount"),
+                valid_until: row.get("valid_until"),
+                spec: row.get::<_, Json<ChannelSpec>>("spec").0,
+            }
+        }
+    }
+
     impl ToSql for ChannelId {
         fn to_sql(
             &self,
 
@@ -0,0 +1,33 @@
+use crate::ResponseError;
+use hyper::{Body, Request};
+use std::future::Future;
+
+// chain middleware function calls
+//
+// function signature
+// fn middleware(mut req: Request) -> Result<Request, ResponseError>
+
+pub async fn chain<M, MF>(
+    req: Request<Body>,
+    middlewares: Vec<M>,
+) -> Result<Request<Body>, ResponseError>
+where
+    MF: Future<Output = Result<Request<Body>, ResponseError>> + Send,
+    M: FnMut(Request<Body>) -> MF,
+{
+    let mut req = Ok(req);
+
+    for mut mw in middlewares.into_iter() {
+        match mw(req.unwrap()).await {
+            Ok(r) => {
+                req = Ok(r);
+            }
+            Err(e) => {
+                req = Err(e);
+                break;
+            }
+        }
+    }
+
+    req
+}
@@ -65,7 +65,7 @@ mod test {
         let channel = channel;
 
         let mut event_aggr = EventAggregate {
-            channel_id: channel.id.clone(),
+            channel_id: channel.id,
             created: Utc::now(),
             events: Default::default(),
         };