Skip to content

Commit 4bea69c

Browse files
bertllllBert
bertllll
and
Bert
authored
Little renamings (#333)
* little renaiming * little renaming: formatting --------- Co-authored-by: Bert <[email protected]>
1 parent 97dfbad commit 4bea69c

40 files changed

+222
-217
lines changed

‎multinode_integration_tests/src/masq_real_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use masq_lib::constants::{CURRENT_LOGFILE_NAME, DEFAULT_UI_PORT};
1414
use masq_lib::test_utils::utils::TEST_DEFAULT_MULTINODE_CHAIN;
1515
use masq_lib::utils::localhost;
1616
use masq_lib::utils::{DEFAULT_CONSUMING_DERIVATION_PATH, DEFAULT_EARNING_DERIVATION_PATH};
17-
use node_lib::blockchain::bip32::Bip32ECKeyProvider;
17+
use node_lib::blockchain::bip32::Bip32EncryptionKeyProvider;
1818
use node_lib::neighborhood::DEFAULT_MIN_HOPS;
1919
use node_lib::sub_lib::accountant::{
2020
PaymentThresholds, DEFAULT_EARNING_WALLET, DEFAULT_PAYMENT_THRESHOLDS,
@@ -377,7 +377,7 @@ impl NodeStartupConfig {
377377
EarningWalletInfo::Address(address) => Wallet::from_str(address).unwrap(),
378378
EarningWalletInfo::DerivationPath(phrase, derivation_path) => {
379379
let mnemonic = Mnemonic::from_phrase(phrase.as_str(), Language::English).unwrap();
380-
let keypair = Bip32ECKeyProvider::try_from((
380+
let keypair = Bip32EncryptionKeyProvider::try_from((
381381
Seed::new(&mnemonic, "passphrase").as_ref(),
382382
derivation_path.as_str(),
383383
))
@@ -392,12 +392,12 @@ impl NodeStartupConfig {
392392
ConsumingWalletInfo::None => None,
393393
ConsumingWalletInfo::PrivateKey(key) => {
394394
let key_bytes = key.from_hex::<Vec<u8>>().unwrap();
395-
let keypair = Bip32ECKeyProvider::from_raw_secret(&key_bytes).unwrap();
395+
let keypair = Bip32EncryptionKeyProvider::from_raw_secret(&key_bytes).unwrap();
396396
Some(Wallet::from(keypair))
397397
}
398398
ConsumingWalletInfo::DerivationPath(phrase, derivation_path) => {
399399
let mnemonic = Mnemonic::from_phrase(phrase, Language::English).unwrap();
400-
let keypair = Bip32ECKeyProvider::try_from((
400+
let keypair = Bip32EncryptionKeyProvider::try_from((
401401
Seed::new(&mnemonic, "passphrase").as_ref(),
402402
derivation_path.as_str(),
403403
))

‎multinode_integration_tests/src/utils.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ use crate::masq_node::{MASQNode, MASQNodeUtils};
55
use crate::masq_real_node::MASQRealNode;
66
use masq_lib::test_utils::utils::TEST_DEFAULT_MULTINODE_CHAIN;
77
use masq_lib::utils::NeighborhoodModeLight;
8-
use node_lib::accountant::database_access_objects::payable_dao::{PayableDao, PayableDaoReal};
9-
use node_lib::accountant::database_access_objects::receivable_dao::{
10-
ReceivableDao, ReceivableDaoReal,
11-
};
8+
use node_lib::accountant::db_access_objects::payable_dao::{PayableDao, PayableDaoReal};
9+
use node_lib::accountant::db_access_objects::receivable_dao::{ReceivableDao, ReceivableDaoReal};
1210
use node_lib::database::connection_wrapper::ConnectionWrapper;
1311
use node_lib::database::db_initializer::{
1412
DbInitializationConfig, DbInitializer, DbInitializerReal, ExternalData,

‎multinode_integration_tests/tests/blockchain_interaction_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use multinode_integration_tests_lib::utils::{
2222
config_dao, node_chain_specific_data_directory, open_all_file_permissions, receivable_dao,
2323
UrlHolder,
2424
};
25-
use node_lib::accountant::database_access_objects::dao_utils::CustomQuery;
25+
use node_lib::accountant::db_access_objects::dao_utils::CustomQuery;
2626
use node_lib::sub_lib::wallet::Wallet;
2727

2828
#[test]

‎multinode_integration_tests/tests/bookkeeping_test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use multinode_integration_tests_lib::masq_real_node::{
66
STANDARD_CLIENT_TIMEOUT_MILLIS,
77
};
88
use multinode_integration_tests_lib::utils::{payable_dao, receivable_dao};
9-
use node_lib::accountant::database_access_objects::dao_utils::CustomQuery;
10-
use node_lib::accountant::database_access_objects::payable_dao::PayableAccount;
11-
use node_lib::accountant::database_access_objects::receivable_dao::ReceivableAccount;
9+
use node_lib::accountant::db_access_objects::dao_utils::CustomQuery;
10+
use node_lib::accountant::db_access_objects::payable_dao::PayableAccount;
11+
use node_lib::accountant::db_access_objects::receivable_dao::ReceivableAccount;
1212
use node_lib::sub_lib::wallet::Wallet;
1313
use std::collections::HashMap;
1414
use std::thread;

‎multinode_integration_tests/tests/verify_bill_payment.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ use multinode_integration_tests_lib::masq_real_node::{
1313
use multinode_integration_tests_lib::utils::{
1414
node_chain_specific_data_directory, open_all_file_permissions, UrlHolder,
1515
};
16-
use node_lib::accountant::database_access_objects::payable_dao::{PayableDao, PayableDaoReal};
17-
use node_lib::accountant::database_access_objects::receivable_dao::{
18-
ReceivableDao, ReceivableDaoReal,
19-
};
20-
use node_lib::blockchain::bip32::Bip32ECKeyProvider;
16+
use node_lib::accountant::db_access_objects::payable_dao::{PayableDao, PayableDaoReal};
17+
use node_lib::accountant::db_access_objects::receivable_dao::{ReceivableDao, ReceivableDaoReal};
18+
use node_lib::blockchain::bip32::Bip32EncryptionKeyProvider;
2119
use node_lib::blockchain::blockchain_interface::{
2220
BlockchainInterface, BlockchainInterfaceWeb3, REQUESTS_IN_PARALLEL,
2321
};
@@ -393,7 +391,7 @@ fn make_node_wallet(seed: &Seed, derivation_path: &str) -> (Wallet, String) {
393391
let secret = extended_priv_key.secret().to_hex::<String>();
394392

395393
(
396-
Wallet::from(Bip32ECKeyProvider::from_key(extended_priv_key)),
394+
Wallet::from(Bip32EncryptionKeyProvider::from_key(extended_priv_key)),
397395
secret,
398396
)
399397
}

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
2-
use crate::accountant::database_access_objects::dao_utils::{
3-
DaoFactoryReal, VigilantRusqliteFlatten,
4-
};
2+
use crate::accountant::db_access_objects::dao_utils::{DaoFactoryReal, VigilantRusqliteFlatten};
53
use crate::database::connection_wrapper::ConnectionWrapper;
64
use crate::sub_lib::wallet::Wallet;
75
use lazy_static::lazy_static;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
4-
use crate::accountant::database_access_objects::payable_dao::PayableAccount;
5-
use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
3+
use crate::accountant::db_access_objects::payable_dao::PayableAccount;
4+
use crate::accountant::db_access_objects::receivable_dao::ReceivableAccount;
5+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
66
use crate::accountant::{checked_conversion, gwei_to_wei, sign_conversion};
77
use crate::database::connection_wrapper::ConnectionWrapper;
88
use crate::database::db_initializer::{

‎node/src/accountant/database_access_objects/mod.rs renamed to ‎node/src/accountant/db_access_objects/mod.rs

File renamed without changes.

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_db_processor::KnownKeyVariants::{
3+
use crate::accountant::db_big_integer::big_int_db_processor::KnownKeyVariants::{
44
PendingPayableRowid, WalletAddress,
55
};
6-
use crate::accountant::big_int_processing::big_int_db_processor::WeiChange::{
6+
use crate::accountant::db_big_integer::big_int_db_processor::WeiChange::{
77
Addition, Subtraction,
88
};
9-
use crate::accountant::big_int_processing::big_int_db_processor::{
9+
use crate::accountant::db_big_integer::big_int_db_processor::{
1010
BigIntDbProcessor, BigIntSqlConfig, Param, SQLParamsBuilder, TableNameDAO,
1111
};
12-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
13-
use crate::accountant::database_access_objects::dao_utils;
14-
use crate::accountant::database_access_objects::dao_utils::{
12+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
13+
use crate::accountant::db_access_objects::dao_utils;
14+
use crate::accountant::db_access_objects::dao_utils::{
1515
sum_i128_values_from_table, to_time_t, AssemblerFeeder, CustomQuery, DaoFactoryReal,
1616
RangeStmConfig, TopStmConfig, VigilantRusqliteFlatten,
1717
};
18-
use crate::accountant::database_access_objects::payable_dao::mark_pending_payable_associated_functions::{
18+
use crate::accountant::db_access_objects::payable_dao::mark_pending_payable_associated_functions::{
1919
compose_case_expression, execute_command, serialize_wallets,
2020
};
2121
use crate::accountant::{checked_conversion, sign_conversion, PendingPayableId};
@@ -402,10 +402,10 @@ impl TableNameDAO for PayableDaoReal {
402402

403403
mod mark_pending_payable_associated_functions {
404404
use crate::accountant::comma_joined_stringifiable;
405-
use crate::accountant::database_access_objects::dao_utils::{
405+
use crate::accountant::db_access_objects::dao_utils::{
406406
update_rows_and_return_valid_count, VigilantRusqliteFlatten,
407407
};
408-
use crate::accountant::database_access_objects::payable_dao::PayableDaoError;
408+
use crate::accountant::db_access_objects::payable_dao::PayableDaoError;
409409
use crate::database::connection_wrapper::ConnectionWrapper;
410410
use crate::sub_lib::wallet::Wallet;
411411
use itertools::Itertools;
@@ -552,9 +552,9 @@ mod mark_pending_payable_associated_functions {
552552
#[cfg(test)]
553553
mod tests {
554554
use super::*;
555-
use crate::accountant::database_access_objects::dao_utils::{from_time_t, now_time_t, to_time_t};
555+
use crate::accountant::db_access_objects::dao_utils::{from_time_t, now_time_t, to_time_t};
556556
use crate::accountant::gwei_to_wei;
557-
use crate::accountant::database_access_objects::payable_dao::mark_pending_payable_associated_functions::explanatory_extension;
557+
use crate::accountant::db_access_objects::payable_dao::mark_pending_payable_associated_functions::explanatory_extension;
558558
use crate::accountant::test_utils::{
559559
assert_account_creation_fn_fails_on_finding_wrong_columns_and_value_types,
560560
make_pending_payable_fingerprint,

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
4-
use crate::accountant::database_access_objects::dao_utils::{
3+
use crate::accountant::db_access_objects::dao_utils::{
54
from_time_t, to_time_t, DaoFactoryReal, VigilantRusqliteFlatten,
65
};
6+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
77
use crate::accountant::{checked_conversion, comma_joined_stringifiable};
88
use crate::blockchain::blockchain_bridge::PendingPayableFingerprint;
99
use crate::database::connection_wrapper::ConnectionWrapper;
@@ -241,12 +241,12 @@ impl<'a> PendingPayableDaoReal<'a> {
241241

242242
#[cfg(test)]
243243
mod tests {
244-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
245244
use crate::accountant::checked_conversion;
246-
use crate::accountant::database_access_objects::dao_utils::from_time_t;
247-
use crate::accountant::database_access_objects::pending_payable_dao::{
245+
use crate::accountant::db_access_objects::dao_utils::from_time_t;
246+
use crate::accountant::db_access_objects::pending_payable_dao::{
248247
PendingPayableDao, PendingPayableDaoError, PendingPayableDaoReal,
249248
};
249+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
250250
use crate::blockchain::blockchain_bridge::PendingPayableFingerprint;
251251
use crate::blockchain::test_utils::make_tx_hash;
252252
use crate::database::connection_wrapper::ConnectionWrapperReal;

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

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_db_processor::KnownKeyVariants::WalletAddress;
4-
use crate::accountant::big_int_processing::big_int_db_processor::WeiChange::{
5-
Addition, Subtraction,
6-
};
7-
use crate::accountant::big_int_processing::big_int_db_processor::{
8-
BigIntDbProcessor, BigIntSqlConfig, Param, SQLParamsBuilder, TableNameDAO,
9-
};
10-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
113
use crate::accountant::checked_conversion;
12-
use crate::accountant::database_access_objects::dao_utils;
13-
use crate::accountant::database_access_objects::dao_utils::{
4+
use crate::accountant::db_access_objects::dao_utils;
5+
use crate::accountant::db_access_objects::dao_utils::{
146
sum_i128_values_from_table, to_time_t, AssemblerFeeder, CustomQuery, DaoFactoryReal,
157
RangeStmConfig, ThresholdUtils, TopStmConfig, VigilantRusqliteFlatten,
168
};
17-
use crate::accountant::database_access_objects::receivable_dao::ReceivableDaoError::RusqliteError;
9+
use crate::accountant::db_access_objects::receivable_dao::ReceivableDaoError::RusqliteError;
10+
use crate::accountant::db_big_integer::big_int_db_processor::KnownKeyVariants::WalletAddress;
11+
use crate::accountant::db_big_integer::big_int_db_processor::WeiChange::{Addition, Subtraction};
12+
use crate::accountant::db_big_integer::big_int_db_processor::{
13+
BigIntDbProcessor, BigIntSqlConfig, Param, SQLParamsBuilder, TableNameDAO,
14+
};
15+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
1816
use crate::accountant::gwei_to_wei;
1917
use crate::blockchain::blockchain_interface::BlockchainTransaction;
2018
use crate::database::connection_wrapper::ConnectionWrapper;
@@ -413,9 +411,7 @@ impl TableNameDAO for ReceivableDaoReal {
413411
#[cfg(test)]
414412
mod tests {
415413
use super::*;
416-
use crate::accountant::database_access_objects::dao_utils::{
417-
from_time_t, now_time_t, to_time_t,
418-
};
414+
use crate::accountant::db_access_objects::dao_utils::{from_time_t, now_time_t, to_time_t};
419415
use crate::accountant::gwei_to_wei;
420416
use crate::accountant::test_utils::{
421417
assert_account_creation_fn_fails_on_finding_wrong_columns_and_value_types,

‎node/src/accountant/big_int_processing/big_int_db_processor.rs renamed to ‎node/src/accountant/db_big_integer/big_int_db_processor.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_divider::BigIntDivider;
43
use crate::accountant::checked_conversion;
5-
use crate::accountant::database_access_objects::payable_dao::PayableDaoError;
6-
use crate::accountant::database_access_objects::receivable_dao::ReceivableDaoError;
4+
use crate::accountant::db_access_objects::payable_dao::PayableDaoError;
5+
use crate::accountant::db_access_objects::receivable_dao::ReceivableDaoError;
6+
use crate::accountant::db_big_integer::big_int_divider::BigIntDivider;
77
use crate::database::connection_wrapper::ConnectionWrapper;
88
use crate::sub_lib::wallet::Wallet;
99
use itertools::Either;
@@ -498,12 +498,12 @@ big_int_db_error_from!(PayableDaoError, ReceivableDaoError);
498498
#[cfg(test)]
499499
mod tests {
500500
use super::*;
501-
use crate::accountant::big_int_processing::big_int_db_processor::ByteMagnitude::{High, Low};
502-
use crate::accountant::big_int_processing::big_int_db_processor::KnownKeyVariants::TestKey;
503-
use crate::accountant::big_int_processing::big_int_db_processor::WeiChange::{
501+
use crate::accountant::db_big_integer::big_int_db_processor::ByteMagnitude::{High, Low};
502+
use crate::accountant::db_big_integer::big_int_db_processor::KnownKeyVariants::TestKey;
503+
use crate::accountant::db_big_integer::big_int_db_processor::WeiChange::{
504504
Addition, Subtraction,
505505
};
506-
use crate::accountant::big_int_processing::test_utils::restricted::{
506+
use crate::accountant::db_big_integer::test_utils::restricted::{
507507
create_new_empty_db, test_database_key,
508508
};
509509
use crate::database::connection_wrapper::{ConnectionWrapper, ConnectionWrapperReal};

‎node/src/accountant/big_int_processing/big_int_divider.rs renamed to ‎node/src/accountant/db_big_integer/big_int_divider.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
use crate::accountant::big_int_processing::big_int_divider::UserDefinedFunctionError::InvalidInputValue;
3+
use crate::accountant::db_big_integer::big_int_divider::UserDefinedFunctionError::InvalidInputValue;
44
use crate::accountant::gwei_to_wei;
55
use rusqlite::functions::{Context, FunctionFlags};
66
use rusqlite::Connection;
@@ -135,7 +135,7 @@ impl Display for UserDefinedFunctionError {
135135
#[cfg(test)]
136136
mod tests {
137137
use super::*;
138-
use crate::accountant::big_int_processing::test_utils::restricted::create_new_empty_db;
138+
use crate::accountant::db_big_integer::test_utils::restricted::create_new_empty_db;
139139
use rusqlite::Error::SqliteFailure;
140140
use rusqlite::ErrorCode;
141141

‎node/src/accountant/big_int_processing/mod.rs renamed to ‎node/src/accountant/db_big_integer/mod.rs

File renamed without changes.

‎node/src/accountant/big_int_processing/test_utils.rs renamed to ‎node/src/accountant/db_big_integer/test_utils.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
pub(in crate::accountant::big_int_processing) mod restricted {
4-
use crate::accountant::big_int_processing::big_int_db_processor::KnownKeyVariants::TestKey;
5-
use crate::accountant::big_int_processing::big_int_db_processor::{
3+
pub(in crate::accountant::db_big_integer) mod restricted {
4+
use crate::accountant::db_big_integer::big_int_db_processor::KnownKeyVariants::TestKey;
5+
use crate::accountant::db_big_integer::big_int_db_processor::{
66
ExtendedParamsMarker, KnownKeyVariants,
77
};
88
use masq_lib::test_utils::utils::ensure_node_home_directory_exists;

‎node/src/accountant/financials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ where
2424
}
2525

2626
pub(in crate::accountant) mod visibility_restricted_module {
27-
use crate::accountant::database_access_objects::dao_utils::CustomQuery;
27+
use crate::accountant::db_access_objects::dao_utils::CustomQuery;
2828
use crate::accountant::financials::{fits_in_0_to_i64max_for_u64, OPCODE_FINANCIALS};
2929
use masq_lib::constants::{
3030
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 {
111111
#[cfg(test)]
112112
mod tests {
113113
use super::visibility_restricted_module::check_query_is_within_tech_limits;
114-
use crate::accountant::database_access_objects::dao_utils::CustomQuery;
114+
use crate::accountant::db_access_objects::dao_utils::CustomQuery;
115115
use crate::accountant::financials::fits_in_0_to_i64max_for_u64;
116116
use masq_lib::constants::VALUE_EXCEEDS_ALLOWED_LIMIT;
117117
use masq_lib::messages::TopRecordsOrdering::Age;

‎node/src/accountant/mod.rs

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
22

3-
pub mod big_int_processing;
4-
pub mod database_access_objects;
3+
pub mod db_access_objects;
4+
pub mod db_big_integer;
55
pub mod financials;
66
pub mod scanners;
77

@@ -18,16 +18,14 @@ use masq_lib::messages::{
1818
};
1919
use masq_lib::ui_gateway::{MessageBody, MessagePath};
2020

21-
use crate::accountant::database_access_objects::dao_utils::{
21+
use crate::accountant::db_access_objects::dao_utils::{
2222
remap_payable_accounts, remap_receivable_accounts, CustomQuery, DaoFactoryReal,
2323
};
24-
use crate::accountant::database_access_objects::payable_dao::{
24+
use crate::accountant::db_access_objects::payable_dao::{
2525
PayableAccount, PayableDao, PayableDaoError,
2626
};
27-
use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDao;
28-
use crate::accountant::database_access_objects::receivable_dao::{
29-
ReceivableDao, ReceivableDaoError,
30-
};
27+
use crate::accountant::db_access_objects::pending_payable_dao::PendingPayableDao;
28+
use crate::accountant::db_access_objects::receivable_dao::{ReceivableDao, ReceivableDaoError};
3129
use crate::accountant::financials::visibility_restricted_module::{
3230
check_query_is_within_tech_limits, financials_entry_check,
3331
};
@@ -1003,13 +1001,13 @@ pub mod check_sqlite_fns {
10031001
#[cfg(test)]
10041002
mod tests {
10051003
use super::*;
1006-
use crate::accountant::database_access_objects::dao_utils::from_time_t;
1007-
use crate::accountant::database_access_objects::dao_utils::{to_time_t, CustomQuery};
1008-
use crate::accountant::database_access_objects::payable_dao::{
1004+
use crate::accountant::db_access_objects::dao_utils::from_time_t;
1005+
use crate::accountant::db_access_objects::dao_utils::{to_time_t, CustomQuery};
1006+
use crate::accountant::db_access_objects::payable_dao::{
10091007
PayableAccount, PayableDaoError, PayableDaoFactory, PendingPayable,
10101008
};
1011-
use crate::accountant::database_access_objects::pending_payable_dao::PendingPayableDaoError;
1012-
use crate::accountant::database_access_objects::receivable_dao::ReceivableAccount;
1009+
use crate::accountant::db_access_objects::pending_payable_dao::PendingPayableDaoError;
1010+
use crate::accountant::db_access_objects::receivable_dao::ReceivableAccount;
10131011
use crate::accountant::scanners::{BeginScanError, NullScanner, ScannerMock};
10141012
use crate::accountant::test_utils::DaoWithDestination::{
10151013
ForAccountantBody, ForPayableScanner, ForPendingPayableScanner, ForReceivableScanner,

0 commit comments

Comments
 (0)