Merge #221

221: Upgrade to cnd 0.4.0 r=mergify[bot] a=D4nte



Co-authored-by: Franck Royer <franck@coblox.tech>

Author: bors[bot]

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 - `separate_apps` example now uses the negotiation protocol provided by comit-sdk.
+- Upgrade to `comit-rs:0.4.0`
 
 ## [0.4.0] - 2019-11-20
 

src/cnd_settings.rs

@@ -4,9 +4,8 @@ use std::net::{IpAddr, Ipv4Addr};
 
 #[derive(Clone, Debug, Serialize, Default)]
 pub struct Settings {
-    pub comit: Comit,
     pub network: Network,
-    pub http_api: HttpSocket,
+    pub http_api: HttpApi,
     pub logging: Logging,
     pub bitcoin: Bitcoin,
     pub ethereum: Ethereum,
@@ -23,11 +22,42 @@ pub struct Network {
     pub listen: Vec<String>,
 }
 #[derive(Clone, Debug, Serialize)]
-pub struct HttpSocket {
+pub struct HttpApi {
+    pub socket: Socket,
+    pub cors: Cors,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct Socket {
     pub address: IpAddr,
     pub port: u16,
 }
 
+#[derive(Clone, Debug, Serialize)]
+pub struct Cors {
+    pub allowed_origins: AllowedOrigins,
+}
+
+#[derive(Clone, Debug, Serialize)]
+#[serde(untagged)]
+pub enum AllowedOrigins {
+    All(All),
+    None(None),
+    Some(Vec<String>),
+}
+
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum All {
+    All,
+}
+
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum None {
+    None,
+}
+
 #[derive(Clone, Debug, Serialize)]
 pub struct Logging {
     pub level: String,
@@ -63,15 +93,32 @@ impl Default for Network {
     }
 }
 
-impl Default for HttpSocket {
-    fn default() -> HttpSocket {
-        HttpSocket {
+impl Default for HttpApi {
+    fn default() -> HttpApi {
+        HttpApi {
+            socket: Socket::default(),
+            cors: Cors::default(),
+        }
+    }
+}
+
+impl Default for Socket {
+    fn default() -> Socket {
+        Socket {
             address: IpAddr::V4(Ipv4Addr::UNSPECIFIED),
             port: 8080,
         }
     }
 }
 
+impl Default for Cors {
+    fn default() -> Cors {
+        Cors {
+            allowed_origins: AllowedOrigins::All(All::All),
+        }
+    }
+}
+
 impl Default for Logging {
     fn default() -> Self {
         Logging {

src/docker/cnd.rs

@@ -5,7 +5,7 @@ const HTTP_URL_PREFIX: &str = "HTTP_URL_";
 pub struct Cnd;
 
 impl Image for Cnd {
-    const IMAGE: &'static str = "comitnetwork/cnd:0.3.0";
+    const IMAGE: &'static str = "comitnetwork/cnd:0.4.0";
     const LOG_READY: &'static str = "Starting HTTP server on";
 
     fn arguments_for_create() -> Vec<&'static str> {

tests/start_env.sh

@@ -12,7 +12,7 @@ echo "Running $0"
 $CCA start-env > /dev/null &
 PID=$!
 
-TIMEOUT=60
+TIMEOUT=300
 TEST_PASSED=false
 
 # Count the number of containers