Merge pull request #1304 from golemfactory/market/default-subscription-ttl-restore-1h

[mkt] Restore 1h as default Offer/Demand TTL

Author: tworec

agent/provider/src/market/provider_market.rs

@@ -73,8 +73,8 @@ pub struct NewAgreement {
 // =========================================== //
 
 /// Sent when subscribing offer to the market will be finished.
-#[rtype(result = "Result<()>")]
 #[derive(Debug, Clone, Message)]
+#[rtype(result = "Result<()>")]
 struct Subscription {
     id: String,
     preset: Preset,

core/market/src/config.rs

@@ -5,9 +5,9 @@ use structopt::StructOpt;
 pub struct Config {
     #[structopt(flatten)]
     pub discovery: DiscoveryConfig,
-    #[structopt(skip)]
+    #[structopt(flatten)]
     pub subscription: SubscriptionConfig,
-    #[structopt(skip)]
+    #[structopt(flatten)]
     pub events: EventsConfig,
 }
 
@@ -33,37 +33,40 @@ pub struct SubscriptionConfig {
     pub default_ttl: chrono::Duration,
 }
 
-#[derive(Clone)]
+#[derive(StructOpt, Clone)]
 pub struct EventsConfig {
+    #[structopt(env = "MAX_MARKET_EVENTS_DEFAULT", default_value = "20")]
     pub max_events_default: i32,
+    #[structopt(env = "MAX_MARKET_EVENTS_MAX", default_value = "100")]
     pub max_events_max: i32,
 }
 
 impl Config {
     pub fn from_env() -> Result<Config, structopt::clap::Error> {
-        // Mock command line arguments, because we want to use ENV fallback
-        // or default values if ENV variables don't exist.
-        Ok(Config::from_iter_safe(vec!["yagna"].iter())?)
+        // Empty command line arguments, because we want to use ENV fallback
+        // or default values if ENV variables are not set.
+        Ok(Config::from_iter_safe(&[""])?)
     }
 }
 
-impl Default for SubscriptionConfig {
-    fn default() -> Self {
-        SubscriptionConfig {
-            default_ttl: chrono::Duration::seconds(50),
-        }
-    }
+fn parse_chrono_duration(s: &str) -> Result<chrono::Duration, anyhow::Error> {
+    Ok(chrono::Duration::from_std(humantime::parse_duration(s)?)?)
 }
 
-impl Default for EventsConfig {
-    fn default() -> Self {
-        EventsConfig {
-            max_events_default: 20,
-            max_events_max: 100,
-        }
+#[cfg(test)]
+mod test {
+    use super::Config;
+
+    #[test]
+    fn test_default_structopt_subscription_ttl() {
+        let c = Config::from_env().unwrap();
+        assert_eq!(60, c.subscription.default_ttl.num_minutes());
     }
-}
 
-fn parse_chrono_duration(s: &str) -> Result<chrono::Duration, anyhow::Error> {
-    Ok(chrono::Duration::from_std(humantime::parse_duration(s)?)?)
+    #[test]
+    fn test_default_structopt_events() {
+        let c = Config::from_env().unwrap();
+        assert_eq!(20, c.events.max_events_default);
+        assert_eq!(100, c.events.max_events_max);
+    }
 }

core/market/src/testing/mock_node.rs

@@ -5,6 +5,7 @@ use anyhow::{anyhow, bail, Context, Result};
 use regex::Regex;
 use std::collections::HashMap;
 use std::{fs, path::PathBuf, sync::Arc, time::Duration};
+use structopt::StructOpt;
 
 use ya_client::model::market::RequestorEvent;
 use ya_persistence::executor::DbExecutor;
@@ -20,7 +21,7 @@ use super::bcast::BCastService;
 use super::mock_net::{gsb_prefixes, MockNet};
 use super::negotiation::{provider, requestor};
 use super::{store::SubscriptionStore, Matcher};
-use crate::config::{Config, DiscoveryConfig};
+use crate::config::{Config, DiscoveryConfig, EventsConfig, SubscriptionConfig};
 use crate::db::dao::ProposalDao;
 use crate::db::model::{Demand, Offer, Proposal, ProposalId, SubscriptionId};
 use crate::identity::IdentityApi;
@@ -680,8 +681,8 @@ pub fn create_market_config_for_test() -> Config {
 
     Config {
         discovery,
-        subscription: Default::default(),
-        events: Default::default(),
+        subscription: SubscriptionConfig::from_iter(&[""]),
+        events: EventsConfig::from_iter(&[""]),
     }
 }