GH-709: Rearranged files in Accountant by folders (#296)

* GH-709: file migration complete

* GH-709: fixes in multinode tests imports

* GH-709: formatting

---------

Co-authored-by: Bert <[email protected]>

Author: bertllll

multinode_integration_tests/src/utils.rs

@@ -5,8 +5,10 @@ use crate::masq_node::{MASQNode, MASQNodeUtils};
 use crate::masq_real_node::MASQRealNode;
 use masq_lib::test_utils::utils::TEST_DEFAULT_MULTINODE_CHAIN;
 use masq_lib::utils::NeighborhoodModeLight;
-use node_lib::accountant::payable_dao::{PayableDao, PayableDaoReal};
-use node_lib::accountant::receivable_dao::{ReceivableDao, ReceivableDaoReal};
+use node_lib::accountant::database_access_objects::payable_dao::{PayableDao, PayableDaoReal};
+use node_lib::accountant::database_access_objects::receivable_dao::{
+    ReceivableDao, ReceivableDaoReal,
+};
 use node_lib::database::connection_wrapper::ConnectionWrapper;
 use node_lib::database::db_initializer::{
     DbInitializationConfig, DbInitializer, DbInitializerReal, ExternalData,

multinode_integration_tests/tests/blockchain_interaction_test.rs

@@ -21,7 +21,7 @@ use multinode_integration_tests_lib::mock_blockchain_client_server::MBCSBuilder;
 use multinode_integration_tests_lib::utils::{
     config_dao, open_all_file_permissions, receivable_dao, UrlHolder,
 };
-use node_lib::accountant::dao_utils::CustomQuery;
+use node_lib::accountant::database_access_objects::dao_utils::CustomQuery;
 use node_lib::sub_lib::wallet::Wallet;
 
 #[test]

multinode_integration_tests/tests/bookkeeping_test.rs

@@ -6,9 +6,9 @@ use multinode_integration_tests_lib::masq_real_node::{
     STANDARD_CLIENT_TIMEOUT_MILLIS,
 };
 use multinode_integration_tests_lib::utils::{payable_dao, receivable_dao};
-use node_lib::accountant::dao_utils::CustomQuery;
-use node_lib::accountant::payable_dao::PayableAccount;
-use node_lib::accountant::receivable_dao::ReceivableAccount;
+use node_lib::accountant::database_access_objects::dao_utils::CustomQuery;
+use node_lib::accountant::database_access_objects::payable_dao::PayableAccount;
+use node_lib::accountant::database_access_objects::receivable_dao::ReceivableAccount;
 use node_lib::sub_lib::wallet::Wallet;
 use std::collections::HashMap;
 use std::thread;

multinode_integration_tests/tests/verify_bill_payment.rs

@@ -12,8 +12,10 @@ use multinode_integration_tests_lib::masq_real_node::{
     NodeStartupConfigBuilder,
 };
 use multinode_integration_tests_lib::utils::{open_all_file_permissions, UrlHolder};
-use node_lib::accountant::payable_dao::{PayableDao, PayableDaoReal};
-use node_lib::accountant::receivable_dao::{ReceivableDao, ReceivableDaoReal};
+use node_lib::accountant::database_access_objects::payable_dao::{PayableDao, PayableDaoReal};
+use node_lib::accountant::database_access_objects::receivable_dao::{
+    ReceivableDao, ReceivableDaoReal,
+};
 use node_lib::blockchain::bip32::Bip32ECKeyProvider;
 use node_lib::blockchain::blockchain_interface::{
     BlockchainInterface, BlockchainInterfaceNonClandestine, REQUESTS_IN_PARALLEL,

node/src/accountant/big_int_processing/big_int_db_processor.rs

@@ -2,8 +2,8 @@
 
 use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
 use crate::accountant::checked_conversion;
-use crate::accountant::payable_dao::PayableDaoError;
-use crate::accountant::receivable_dao::ReceivableDaoError;
+use crate::accountant::database_access_objects::payable_dao::PayableDaoError;
+use crate::accountant::database_access_objects::receivable_dao::ReceivableDaoError;
 use crate::database::connection_wrapper::ConnectionWrapper;
 use crate::sub_lib::wallet::Wallet;
 use itertools::Either;

node/src/banned_dao.rs renamed to node/src/accountant/database_access_objects/banned_dao.rs

@@ -1,5 +1,7 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
-use crate::accountant::dao_utils::{DaoFactoryReal, VigilantRusqliteFlatten};
+use crate::accountant::database_access_objects::dao_utils::{
+    DaoFactoryReal, VigilantRusqliteFlatten,
+};
 use crate::database::connection_wrapper::ConnectionWrapper;
 use crate::sub_lib::wallet::Wallet;
 use lazy_static::lazy_static;

node/src/accountant/dao_utils.rs renamed to node/src/accountant/database_access_objects/dao_utils.rs

@@ -1,8 +1,8 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
 use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
-use crate::accountant::payable_dao::PayableAccount;
-use crate::accountant::receivable_dao::ReceivableAccount;
+use crate::accountant::database_access_objects::payable_dao::PayableAccount;
+use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
 use crate::accountant::{checked_conversion, gwei_to_wei, sign_conversion};
 use crate::database::connection_wrapper::ConnectionWrapper;
 use crate::database::db_initializer::{

node/src/accountant/database_access_objects/mod.rs

@@ -0,0 +1,7 @@
+// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
+
+pub mod banned_dao;
+pub mod dao_utils;
+pub mod payable_dao;
+pub mod pending_payable_dao;
+pub mod receivable_dao;

node/src/accountant/payable_dao.rs renamed to node/src/accountant/database_access_objects/payable_dao.rs

@@ -10,12 +10,12 @@ use crate::accountant::big_int_processing::big_int_db_processor::{
     BigIntDbProcessor, BigIntSqlConfig, Param, SQLParamsBuilder, TableNameDAO,
 };
 use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
-use crate::accountant::dao_utils;
-use crate::accountant::dao_utils::{
+use crate::accountant::database_access_objects::dao_utils;
+use crate::accountant::database_access_objects::dao_utils::{
     sum_i128_values_from_table, to_time_t, AssemblerFeeder, CustomQuery, DaoFactoryReal,
     RangeStmConfig, TopStmConfig, VigilantRusqliteFlatten,
 };
-use crate::accountant::payable_dao::mark_pending_payable_associated_functions::{
+use crate::accountant::database_access_objects::payable_dao::mark_pending_payable_associated_functions::{
     compose_case_expression, execute_command, serialize_wallets,
 };
 use crate::accountant::{checked_conversion, sign_conversion, PendingPayableId};
@@ -402,10 +402,10 @@ impl TableNameDAO for PayableDaoReal {
 
 mod mark_pending_payable_associated_functions {
     use crate::accountant::comma_joined_stringifiable;
-    use crate::accountant::dao_utils::{
+    use crate::accountant::database_access_objects::dao_utils::{
         update_rows_and_return_valid_count, VigilantRusqliteFlatten,
     };
-    use crate::accountant::payable_dao::PayableDaoError;
+    use crate::accountant::database_access_objects::payable_dao::PayableDaoError;
     use crate::database::connection_wrapper::ConnectionWrapper;
     use crate::sub_lib::wallet::Wallet;
     use itertools::Itertools;
@@ -552,9 +552,9 @@ mod mark_pending_payable_associated_functions {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::accountant::dao_utils::{from_time_t, now_time_t, to_time_t};
+    use crate::accountant::database_access_objects::dao_utils::{from_time_t, now_time_t, to_time_t};
     use crate::accountant::gwei_to_wei;
-    use crate::accountant::payable_dao::mark_pending_payable_associated_functions::explanatory_extension;
+    use crate::accountant::database_access_objects::payable_dao::mark_pending_payable_associated_functions::explanatory_extension;
     use crate::accountant::test_utils::{
         assert_account_creation_fn_fails_on_finding_wrong_columns_and_value_types,
         make_pending_payable_fingerprint,

node/src/accountant/pending_payable_dao.rs renamed to node/src/accountant/database_access_objects/pending_payable_dao.rs

@@ -1,7 +1,7 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
 use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
-use crate::accountant::dao_utils::{
+use crate::accountant::database_access_objects::dao_utils::{
     from_time_t, to_time_t, DaoFactoryReal, VigilantRusqliteFlatten,
 };
 use crate::accountant::{checked_conversion, comma_joined_stringifiable};
@@ -243,8 +243,8 @@ impl<'a> PendingPayableDaoReal<'a> {
 mod tests {
     use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
     use crate::accountant::checked_conversion;
-    use crate::accountant::dao_utils::from_time_t;
-    use crate::accountant::pending_payable_dao::{
+    use crate::accountant::database_access_objects::dao_utils::from_time_t;
+    use crate::accountant::database_access_objects::pending_payable_dao::{
         PendingPayableDao, PendingPayableDaoError, PendingPayableDaoReal,
     };
     use crate::blockchain::blockchain_bridge::PendingPayableFingerprint;

node/src/accountant/receivable_dao.rs renamed to node/src/accountant/database_access_objects/receivable_dao.rs

@@ -9,12 +9,13 @@ use crate::accountant::big_int_processing::big_int_db_processor::{
 };
 use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
 use crate::accountant::checked_conversion;
-use crate::accountant::dao_utils::{
+use crate::accountant::database_access_objects::dao_utils;
+use crate::accountant::database_access_objects::dao_utils::{
     sum_i128_values_from_table, to_time_t, AssemblerFeeder, CustomQuery, DaoFactoryReal,
     RangeStmConfig, ThresholdUtils, TopStmConfig, VigilantRusqliteFlatten,
 };
-use crate::accountant::receivable_dao::ReceivableDaoError::RusqliteError;
-use crate::accountant::{dao_utils, gwei_to_wei};
+use crate::accountant::database_access_objects::receivable_dao::ReceivableDaoError::RusqliteError;
+use crate::accountant::gwei_to_wei;
 use crate::blockchain::blockchain_interface::BlockchainTransaction;
 use crate::database::connection_wrapper::ConnectionWrapper;
 use crate::database::db_initializer::{connection_or_panic, DbInitializerReal};
@@ -412,7 +413,9 @@ impl TableNameDAO for ReceivableDaoReal {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::accountant::dao_utils::{from_time_t, now_time_t, to_time_t};
+    use crate::accountant::database_access_objects::dao_utils::{
+        from_time_t, now_time_t, to_time_t,
+    };
     use crate::accountant::gwei_to_wei;
     use crate::accountant::test_utils::{
         assert_account_creation_fn_fails_on_finding_wrong_columns_and_value_types,

node/src/accountant/financials.rs

@@ -24,7 +24,7 @@ where
 }
 
 pub(in crate::accountant) mod visibility_restricted_module {
-    use crate::accountant::dao_utils::CustomQuery;
+    use crate::accountant::database_access_objects::dao_utils::CustomQuery;
     use crate::accountant::financials::{fits_in_0_to_i64max_for_u64, OPCODE_FINANCIALS};
     use masq_lib::constants::{
         REQUEST_WITH_MUTUALLY_EXCLUSIVE_PARAMS, REQUEST_WITH_NO_VALUES, VALUE_EXCEEDS_ALLOWED_LIMIT,
@@ -111,7 +111,7 @@ pub(in crate::accountant) mod visibility_restricted_module {
 #[cfg(test)]
 mod tests {
     use super::visibility_restricted_module::check_query_is_within_tech_limits;
-    use crate::accountant::dao_utils::CustomQuery;
+    use crate::accountant::database_access_objects::dao_utils::CustomQuery;
     use crate::accountant::financials::fits_in_0_to_i64max_for_u64;
     use masq_lib::constants::VALUE_EXCEEDS_ALLOWED_LIMIT;
     use masq_lib::messages::TopRecordsOrdering::Age;

node/src/accountant/mod.rs

@@ -1,13 +1,9 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
 pub mod big_int_processing;
-pub mod dao_utils;
+pub mod database_access_objects;
 pub mod financials;
-pub mod payable_dao;
-pub mod pending_payable_dao;
-pub mod receivable_dao;
 pub mod scanners;
-pub mod scanners_utils;
 
 #[cfg(test)]
 pub mod test_utils;
@@ -22,15 +18,19 @@ use masq_lib::messages::{
 };
 use masq_lib::ui_gateway::{MessageBody, MessagePath};
 
-use crate::accountant::dao_utils::{
+use crate::accountant::database_access_objects::dao_utils::{
     remap_payable_accounts, remap_receivable_accounts, CustomQuery, DaoFactoryReal,
 };
+use crate::accountant::database_access_objects::payable_dao::{
+    PayableAccount, PayableDao, PayableDaoError,
+};
+use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDao;
+use crate::accountant::database_access_objects::receivable_dao::{
+    ReceivableDao, ReceivableDaoError,
+};
 use crate::accountant::financials::visibility_restricted_module::{
     check_query_is_within_tech_limits, financials_entry_check,
 };
-use crate::accountant::payable_dao::{PayableAccount, PayableDaoError};
-use crate::accountant::pending_payable_dao::PendingPayableDao;
-use crate::accountant::receivable_dao::ReceivableDaoError;
 use crate::accountant::scanners::{ScanTimings, Scanners};
 use crate::blockchain::blockchain_bridge::{
     PendingPayableFingerprint, PendingPayableFingerprintSeeds, RetrieveTransactions,
@@ -68,8 +68,6 @@ use masq_lib::messages::{FromMessageBody, ToMessageBody, UiFinancialsRequest};
 use masq_lib::ui_gateway::MessageTarget::ClientId;
 use masq_lib::ui_gateway::{NodeFromUiMessage, NodeToUiMessage};
 use masq_lib::utils::ExpectValue;
-use payable_dao::PayableDao;
-use receivable_dao::ReceivableDao;
 use std::any::type_name;
 #[cfg(test)]
 use std::default::Default;
@@ -1005,13 +1003,13 @@ pub mod check_sqlite_fns {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::accountant::dao_utils::from_time_t;
-    use crate::accountant::dao_utils::{to_time_t, CustomQuery};
-    use crate::accountant::payable_dao::{
+    use crate::accountant::database_access_objects::dao_utils::from_time_t;
+    use crate::accountant::database_access_objects::dao_utils::{to_time_t, CustomQuery};
+    use crate::accountant::database_access_objects::payable_dao::{
         PayableAccount, PayableDaoError, PayableDaoFactory, PendingPayable,
     };
-    use crate::accountant::pending_payable_dao::PendingPayableDaoError;
-    use crate::accountant::receivable_dao::ReceivableAccount;
+    use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDaoError;
+    use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
     use crate::accountant::scanners::{BeginScanError, NullScanner, ScannerMock};
     use crate::accountant::test_utils::DaoWithDestination::{
         ForAccountantBody, ForPayableScanner, ForPendingPayableScanner, ForReceivableScanner,

node/src/accountant/scanners.rs renamed to node/src/accountant/scanners/mod.rs

@@ -1,30 +1,32 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
-use crate::accountant::payable_dao::{PayableAccount, PayableDao, PendingPayable};
-use crate::accountant::pending_payable_dao::PendingPayableDao;
-use crate::accountant::receivable_dao::ReceivableDao;
-use crate::accountant::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
+pub mod scanners_utils;
+
+use crate::accountant::database_access_objects::payable_dao::{PayableAccount, PayableDao, PendingPayable};
+use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDao;
+use crate::accountant::database_access_objects::receivable_dao::ReceivableDao;
+use crate::accountant::scanners::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
     LocallyCausedError, RemotelyCausedErrors,
 };
-use crate::accountant::scanners_utils::payable_scanner_utils::{
+use crate::accountant::scanners::scanners_utils::payable_scanner_utils::{
     debugging_summary_after_error_separation, err_msg_if_failed_without_existing_fingerprints,
     investigate_debt_extremes, mark_pending_payable_fatal_error, payables_debug_summary,
     separate_errors, separate_rowids_and_hashes, PayableThresholdsGauge,
     PayableThresholdsGaugeReal, PayableTransactingErrorEnum, PendingPayableTriple,
     VecOfRowidOptAndHash,
 };
-use crate::accountant::scanners_utils::pending_payable_scanner_utils::{
+use crate::accountant::scanners::scanners_utils::pending_payable_scanner_utils::{
     elapsed_in_ms, handle_none_status, handle_status_with_failure, handle_status_with_success,
     PendingPayableScanReport,
 };
-use crate::accountant::scanners_utils::receivable_scanner_utils::balance_and_age;
+use crate::accountant::scanners::scanners_utils::receivable_scanner_utils::balance_and_age;
 use crate::accountant::PendingPayableId;
 use crate::accountant::{
     comma_joined_stringifiable, gwei_to_wei, Accountant, ReceivedPayments,
     ReportTransactionReceipts, RequestTransactionReceipts, ResponseSkeleton, ScanForPayables,
     ScanForPendingPayables, ScanForReceivables, SentPayables,
 };
-use crate::banned_dao::BannedDao;
+use crate::accountant::database_access_objects::banned_dao::BannedDao;
 use crate::blockchain::blockchain_bridge::{PendingPayableFingerprint, RetrieveTransactions};
 use crate::blockchain::blockchain_interface::PayableTransactionError;
 use crate::sub_lib::accountant::{
@@ -1094,11 +1096,13 @@ mod tests {
     use std::ops::Sub;
     use std::panic::{catch_unwind, AssertUnwindSafe};
 
-    use crate::accountant::dao_utils::{from_time_t, to_time_t};
-    use crate::accountant::payable_dao::{PayableAccount, PayableDaoError, PendingPayable};
-    use crate::accountant::pending_payable_dao::PendingPayableDaoError;
-    use crate::accountant::scanners_utils::payable_scanner_utils::PayableThresholdsGaugeReal;
-    use crate::accountant::scanners_utils::pending_payable_scanner_utils::PendingPayableScanReport;
+    use crate::accountant::database_access_objects::dao_utils::{from_time_t, to_time_t};
+    use crate::accountant::database_access_objects::payable_dao::{
+        PayableAccount, PayableDaoError, PendingPayable,
+    };
+    use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDaoError;
+    use crate::accountant::scanners::scanners_utils::payable_scanner_utils::PayableThresholdsGaugeReal;
+    use crate::accountant::scanners::scanners_utils::pending_payable_scanner_utils::PendingPayableScanReport;
     use crate::blockchain::blockchain_interface::ProcessedPayableFallible::{Correct, Failed};
     use crate::blockchain::blockchain_interface::{
         BlockchainTransaction, PayableTransactionError, RpcPayableFailure,

node/src/accountant/scanners_utils.rs renamed to node/src/accountant/scanners/scanners_utils.rs

@@ -1,9 +1,9 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
 pub mod payable_scanner_utils {
-    use crate::accountant::dao_utils::ThresholdUtils;
-    use crate::accountant::payable_dao::{PayableAccount, PayableDaoError, PendingPayable};
-    use crate::accountant::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
+    use crate::accountant::database_access_objects::dao_utils::ThresholdUtils;
+    use crate::accountant::database_access_objects::payable_dao::{PayableAccount, PayableDaoError, PendingPayable};
+    use crate::accountant::scanners::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
         LocallyCausedError, RemotelyCausedErrors,
     };
     use crate::accountant::{comma_joined_stringifiable, SentPayables};
@@ -399,7 +399,7 @@ pub mod pending_payable_scanner_utils {
 }
 
 pub mod receivable_scanner_utils {
-    use crate::accountant::receivable_dao::ReceivableAccount;
+    use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
     use crate::accountant::wei_to_gwei;
     use std::time::{Duration, SystemTime};
     use thousands::Separable;
@@ -415,18 +415,18 @@ pub mod receivable_scanner_utils {
 
 #[cfg(test)]
 mod tests {
-    use crate::accountant::dao_utils::{from_time_t, to_time_t};
-    use crate::accountant::payable_dao::{PayableAccount, PendingPayable};
-    use crate::accountant::receivable_dao::ReceivableAccount;
-    use crate::accountant::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
+    use crate::accountant::database_access_objects::dao_utils::{from_time_t, to_time_t};
+    use crate::accountant::database_access_objects::payable_dao::{PayableAccount, PendingPayable};
+    use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
+    use crate::accountant::scanners::scanners_utils::payable_scanner_utils::PayableTransactingErrorEnum::{
         LocallyCausedError, RemotelyCausedErrors,
     };
-    use crate::accountant::scanners_utils::payable_scanner_utils::{
+    use crate::accountant::scanners::scanners_utils::payable_scanner_utils::{
         count_total_errors, debugging_summary_after_error_separation, investigate_debt_extremes,
         payables_debug_summary, separate_errors, PayableThresholdsGauge,
         PayableThresholdsGaugeReal,
     };
-    use crate::accountant::scanners_utils::receivable_scanner_utils::balance_and_age;
+    use crate::accountant::scanners::scanners_utils::receivable_scanner_utils::balance_and_age;
     use crate::accountant::{checked_conversion, gwei_to_wei, SentPayables};
     use crate::blockchain::blockchain_interface::ProcessedPayableFallible::{Correct, Failed};
     use crate::blockchain::blockchain_interface::{