GH-613: cutting back on too many report consume messages jamming Acco…

…untant...version 2 with a fix (#167) * GH-613: half of messages to accrue debts handled * GH-613: preparing tests for handling reports to acountant regarding the return route * GH-613: continuing building structures for agreggated reporting; now at the response side...finalizing tests that will cover this change * GH-613: before trying to appeace tests with meaningless expected services * GH-613: old tests in proxy server passing; two todos left * GH-497: Accountant one more test fixed * GH-613: last tests in accountant were caressed and now sleep well * GH-613: last todos knocked out * GH-613: autoreview * GH-613: Revamped msg_id() * GH-613: wrote a test that could detect the wrong timestamp...and much more than just timestamp * GH-613: one version to fix it, will test alternatives * GH-613: slightly lighter version * GH-613: interim commit...I need to undress recorder and instead get it the assert message * GH-613: the lack of tests is gone * GH-613: ready for Actions * GH-613: save point before an experiment * GH-613-since-first-review: blind alley; though the coflict of mutability is nicely refactored now * GH-613-since-first-review: it works and looks prettier, let's go to have a party time * GH-613-since-first-review: finished refactoring of handle_IBCD * GH-613-since-first-review: fixed a couple of tests * GH-613-since-first-review: knocked out a few more requests from the review * GH-613-since-first-review: a few more features fixed; msg id generator edhancemend * GH-613-since-first-review: everything requested is fixed; now I might do some last refactoring before the review 2 * GH-613-since-first-review: finished, now review? * Gh 613 since first review (#168) * GH-613: save point before an experiment * GH-613-since-first-review: blind alley; though the coflict of mutability is nicely refactored now * GH-613-since-first-review: it works and looks prettier, let's go to have a party time * GH-613-since-first-review: finished refactoring of handle_IBCD * GH-613-since-first-review: fixed a couple of tests * GH-613-since-first-review: knocked out a few more requests from the review * GH-613-since-first-review: a few more features fixed; msg id generator edhancemend * GH-613-since-first-review: everything requested is fixed; now I might do some last refactoring before the review 2 * GH-613-since-first-review: finished, now review? Co-authored-by: Bert <[email protected]> * GH-613-second-review: repaired tests in proxy_server/mod.rs which were sensitive on is_decentralized * GH-613-second-review: some minor changes, sweeping; should be done all * GH-613-second-review: changed versioning of crates round the codebase Co-authored-by: Bert <[email protected]> Co-authored-by: Dan Wiebe <[email protected]>
MASQ-Project · Sep 3, 2022 · e6163af · e6163af
1 parent e09c1e7
commit e6163af
Show file tree

Hide file tree

Showing 26 changed files with 1,579 additions and 1,175 deletions.
diff --git a/automap/Cargo.lock b/automap/Cargo.lock
diff --git a/automap/Cargo.toml b/automap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "automap"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 copyright = "Copyright (c) 2019-2021, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

diff --git a/dns_utility/Cargo.lock b/dns_utility/Cargo.lock
diff --git a/dns_utility/Cargo.toml b/dns_utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dns_utility"
-version = "0.6.1"
+version = "0.6.2"
 license = "GPL-3.0-only"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

diff --git a/masq/Cargo.toml b/masq/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "masq"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

diff --git a/masq_lib/Cargo.toml b/masq_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "masq_lib"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

diff --git a/masq_lib/src/logger.rs b/masq_lib/src/logger.rs
@@ -263,7 +263,7 @@ impl Logger {
         level <= self.level_limit
     }
 
-    pub fn set_level_for_a_test(&mut self, level: Level) {
+    pub fn set_level_for_test(&mut self, level: Level) {
         self.level_limit = level
     }
 }

diff --git a/masq_lib/src/utils.rs b/masq_lib/src/utils.rs
@@ -337,6 +337,26 @@ pub fn type_name_of<T>(_examined: T) -> &'static str {
     std::any::type_name::<T>()
 }
 
+pub trait MutabilityConflictHelper<T>
+where
+    T: 'static,
+{
+    type Result;
+
+    //note: you should not write your own impl of this defaulted method
+    fn help<F>(&mut self, closure: F) -> Self::Result
+    where
+        F: FnOnce(&T, &mut Self) -> Self::Result,
+    {
+        let helper = self.helper_access().take().expectv("helper");
+        let result = closure(&helper, self);
+        self.helper_access().replace(helper);
+        result
+    }
+
+    fn helper_access(&mut self) -> &mut Option<T>;
+}
+
 #[macro_export]
 macro_rules! short_writeln {
     ($dst:expr) => (

diff --git a/multinode_integration_tests/Cargo.toml b/multinode_integration_tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multinode_integration_tests"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node"
-version = "0.6.1"
+version = "0.6.2"
 license = "GPL-3.0-only"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."