Merge branch 'dev' into issue-151-migrations

Author: elpiel

Cargo.lock

@@ -5,7 +5,7 @@ authors = ["Lachezar Lechev <[email protected]>, Omidiora Samuel <[email protected]
 edition = "2018"
 
 [features]
-postgres = ["postgres-types", "bytes", "bb8-postgres"]
+postgres = ["postgres-types", "bytes", "tokio-postgres"]
 
 [dependencies]
 # Futures
@@ -39,7 +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}
-bb8-postgres = {git = "https://github.com/djc/bb8", branch = "async-await", features = ["with-chrono-0_4", "with-serde_json-1"], 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"

primitives/Cargo.toml

@@ -198,11 +198,11 @@ impl Error for ChannelError {
 pub mod postgres {
     use super::ChannelId;
     use super::{Channel, ChannelSpec};
-    use bb8_postgres::tokio_postgres::{types::Json, Row};
     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>> {

primitives/src/channel.rs

@@ -35,8 +35,8 @@ pub mod event_reducer;
 lazy_static! {
     static ref CHANNEL_GET_BY_ID: Regex =
         Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
-    static ref LAST_APPROVED_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/last-approved?$").expect("The regex should be valid");
-    static ref CHANNEL_STATUS_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/status?$").expect("The regex should be valid");
+    static ref LAST_APPROVED_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/last-approved/?$").expect("The regex should be valid");
+    static ref CHANNEL_STATUS_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/status/?$").expect("The regex should be valid");
     // @TODO define other regex routes
 }
 
@@ -63,8 +63,6 @@ pub struct Application<A: Adapter> {
     pub logger: Logger,
     pub redis: MultiplexedConnection,
     pub pool: DbPool,
-    pub _clustered: bool,
-    pub port: u16,
     pub config: Config,
     __secret: (),
 }
@@ -76,17 +74,13 @@ impl<A: Adapter + 'static> Application<A> {
         logger: Logger,
         redis: MultiplexedConnection,
         pool: DbPool,
-        clustered: bool,
-        port: u16,
     ) -> Self {
         Self {
             adapter,
             config,
             logger,
             redis,
             pool,
-            _clustered: clustered,
-            port,
             __secret: (),
         }
     }

sentry/src/lib.rs

@@ -107,15 +107,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     match adapter {
         AdapterTypes::EthereumAdapter(adapter) => {
-            run(Application::new(
-                *adapter, config, logger, redis, postgres, clustered, port,
-            ))
+            run(
+                Application::new(*adapter, config, logger, redis, postgres),
+                clustered,
+                port,
+            )
             .await
         }
         AdapterTypes::DummyAdapter(adapter) => {
-            run(Application::new(
-                *adapter, config, logger, redis, postgres, clustered, port,
-            ))
+            run(
+                Application::new(*adapter, config, logger, redis, postgres),
+                clustered,
+                port,
+            )
             .await
         }
     };
@@ -124,10 +128,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 /// Starts the `hyper` `Server`.
-async fn run<A: Adapter + 'static>(app: Application<A>) {
-    let addr = ([127, 0, 0, 1], app.port).into();
+async fn run<A: Adapter + 'static>(app: Application<A>, _clustered: bool, port: u16) {
+    let addr = ([127, 0, 0, 1], port).into();
     let logger = app.logger.clone();
-    info!(&logger, "Listening on port {}!", app.port);
+    info!(&logger, "Listening on port {}!", port);
 
     let make_service = make_service_fn(move |_| {
         let server = app.clone();