Merge branch 'dev' into clean-up-marketing-campaign

elpiel · web-flow · commit 527f1e9c6088 · 2020-04-15T14:20:16.000+03:00
diff --git a/docs/config/dev.toml b/docs/config/dev.toml
@@ -13,7 +13,6 @@ health_threshold_promilles = 950
 health_unsignable_promilles = 750
 propagation_timeout = 1000
 
-list_timeout = 5000
 fetch_timeout = 5000
 validator_tick_timeout = 5000
 
diff --git a/docs/config/prod.toml b/docs/config/prod.toml
@@ -13,7 +13,6 @@ health_threshold_promilles = 970
 health_unsignable_promilles = 770
 propagation_timeout = 3000
 
-list_timeout = 10000
 fetch_timeout = 10000
 validator_tick_timeout = 10000
 
diff --git a/primitives/src/config.rs b/primitives/src/config.rs
@@ -29,7 +29,6 @@ pub struct Config {
     pub health_unsignable_promilles: u32,
     pub propagation_timeout: u32,
     pub fetch_timeout: u32,
-    pub list_timeout: u32,
     pub validator_tick_timeout: u32,
     pub ip_rate_limit: RateLimit,  // HashMap??
     pub sid_rate_limit: RateLimit, // HashMap ??
diff --git a/sentry/src/access.rs b/sentry/src/access.rs
@@ -72,7 +72,7 @@ pub async fn check_access(
     }
 
     // Only the creator can send a CLOSE
-    if is_creator && events.iter().any(is_close_event) {
+    if !is_creator && events.iter().any(is_close_event) {
         return Err(Error::OnlyCreatorCanCloseChannel);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ pub async fn check_access(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// Only the creator can send a CLOSE`
`75`		`- if is_creator && events.iter().any(is_close_event) {`
	`75`	`+ if !is_creator && events.iter().any(is_close_event) {`
`76`	`76`	`return Err(Error::OnlyCreatorCanCloseChannel);`
`77`	`77`	`}`
`78`	`78`