Skip to content

Commit e6163af

Browse files
bertllllBertdnwiebe
authored
GH-613: cutting back on too many report consume messages jamming Accountant...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]>
1 parent e09c1e7 commit e6163af

File tree

26 files changed

+1579
-1175
lines changed

26 files changed

+1579
-1175
lines changed

automap/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

automap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "automap"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
authors = ["Dan Wiebe <[email protected]>", "MASQ"]
55
license = "GPL-3.0-only"
66
copyright = "Copyright (c) 2019-2021, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

dns_utility/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dns_utility/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dns_utility"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
license = "GPL-3.0-only"
55
authors = ["Dan Wiebe <[email protected]>", "MASQ"]
66
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

masq/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "masq"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
authors = ["Dan Wiebe <[email protected]>", "MASQ"]
55
license = "GPL-3.0-only"
66
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

masq_lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "masq_lib"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
authors = ["Dan Wiebe <[email protected]>", "MASQ"]
55
license = "GPL-3.0-only"
66
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

masq_lib/src/logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ impl Logger {
263263
level <= self.level_limit
264264
}
265265

266-
pub fn set_level_for_a_test(&mut self, level: Level) {
266+
pub fn set_level_for_test(&mut self, level: Level) {
267267
self.level_limit = level
268268
}
269269
}

masq_lib/src/utils.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,26 @@ pub fn type_name_of<T>(_examined: T) -> &'static str {
337337
std::any::type_name::<T>()
338338
}
339339

340+
pub trait MutabilityConflictHelper<T>
341+
where
342+
T: 'static,
343+
{
344+
type Result;
345+
346+
//note: you should not write your own impl of this defaulted method
347+
fn help<F>(&mut self, closure: F) -> Self::Result
348+
where
349+
F: FnOnce(&T, &mut Self) -> Self::Result,
350+
{
351+
let helper = self.helper_access().take().expectv("helper");
352+
let result = closure(&helper, self);
353+
self.helper_access().replace(helper);
354+
result
355+
}
356+
357+
fn helper_access(&mut self) -> &mut Option<T>;
358+
}
359+
340360
#[macro_export]
341361
macro_rules! short_writeln {
342362
($dst:expr) => (

multinode_integration_tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "multinode_integration_tests"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
authors = ["Dan Wiebe <[email protected]>", "MASQ"]
55
license = "GPL-3.0-only"
66
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

node/Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)