Merge branch 'master' into GH-678

MASQ-Project · Mar 29, 2023 · f0ec8f1 · f0ec8f1
2 parents 5376464 + 90048cb
commit f0ec8f1
Show file tree

Hide file tree

Showing 17 changed files with 2,603 additions and 2,334 deletions.
diff --git a/masq_lib/src/ui_traffic_converter.rs b/masq_lib/src/ui_traffic_converter.rs
@@ -549,7 +549,7 @@ mod tests {
 
     #[test]
     fn new_unmarshaling_handles_badly_typed_json() {
-        let json = r#"[1, 2, 3, 4]"#;
+        let json = "[1, 2, 3, 4]";
 
         let result = UiTrafficConverter::new_unmarshal_from_ui(json, 1234);
 

diff --git a/multinode_integration_tests/tests/bookkeeping_test.rs b/multinode_integration_tests/tests/bookkeeping_test.rs
@@ -41,7 +41,7 @@ fn provided_and_consumed_services_are_recorded_in_databases() {
     let payables = non_pending_payables(&originating_node);
 
     // Waiting until the serving nodes have finished accruing their receivables
-    thread::sleep(Duration::from_secs(3));
+    thread::sleep(Duration::from_millis(3500));
 
     // get all receivables from all other nodes
     let receivable_balances = non_originating_nodes

diff --git a/node/src/database/db_initializer.rs b/node/src/database/db_initializer.rs
@@ -1,6 +1,7 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 use crate::database::connection_wrapper::{ConnectionWrapper, ConnectionWrapperReal};
-use crate::database::db_migrations::{DbMigrator, DbMigratorReal};
+
+use crate::database::db_migrations::db_migrator::{DbMigrator, DbMigratorReal};
 use crate::db_config::secure_config_layer::EXAMPLE_ENCRYPTED;
 use crate::sub_lib::accountant::{DEFAULT_PAYMENT_THRESHOLDS, DEFAULT_SCAN_INTERVALS};
 use crate::sub_lib::neighborhood::DEFAULT_RATE_PACK;
@@ -1375,8 +1376,8 @@ mod tests {
             )
         );
         let mut migrate_database_params = migrate_database_params_arc.lock().unwrap();
-        let (mismatched_schema, target_version, _) = migrate_database_params.remove(0);
-        assert_eq!(mismatched_schema, 0);
+        let (obsolete_schema, target_version, _) = migrate_database_params.remove(0);
+        assert_eq!(obsolete_schema, 0);
         assert_eq!(target_version, 5);
         TestLogHandler::new().exists_log_containing(
             "WARN: DbInitializer: Database is incompatible and its updating is necessary",