refactor models and traits with pub use

3 files changed, 6 insertions, 4 deletions

diff --git a/schist_core/schist_queries/tests/categories.rs b/schist_core/schist_queries/tests/categories.rs
index 5ef6552..72dd4c7 100644
--- a/schist_core/schist_queries/tests/categories.rs
+++ b/schist_core/schist_queries/tests/categories.rs
@@ -3,7 +3,7 @@ mod common;
 use common::test_context::TestContext;
 use diesel::{Connection, SqliteConnection};
 use schist_fakes::bucket::make_fake_bucket;
-use schist_models::bucket::Bucket;
+use schist_models::Bucket;
 use schist_queries as queries;
 
 fn given_buckets(connection: &mut SqliteConnection) -> Vec<Bucket> {
@@ -33,7 +33,9 @@ fn given_buckets_when_get_all_buckets_then_return_buckets() {
 
     assert_eq!(buckets_in_db.len(), buckets.len());
     for bucket in &buckets {
-        assert!(buckets_in_db.iter().any(|bucket_in_db| bucket_in_db.eq(&bucket)));
+        assert!(buckets_in_db
+            .iter()
+            .any(|bucket_in_db| bucket_in_db.eq(&bucket)));
     }
     for bucket_in_db in buckets_in_db {
         assert!(buckets.iter().any(|bucket| bucket.eq(&bucket_in_db)));
diff --git a/schist_core/schist_queries/tests/drips.rs b/schist_core/schist_queries/tests/drips.rs
index dccdbf4..571ceb3 100644
--- a/schist_core/schist_queries/tests/drips.rs
+++ b/schist_core/schist_queries/tests/drips.rs
@@ -3,7 +3,7 @@ mod common;
 use common::test_context::TestContext;
 use diesel::{Connection, SqliteConnection};
 use schist_fakes::{bucket::make_fake_bucket, drip::make_fake_drip_builder};
-use schist_models::{bucket::Bucket, date_utc::DateUtc};
+use schist_models::{Bucket, DateUtc};
 use schist_queries as queries;
 
 fn given_buckets(connection: &mut SqliteConnection) -> Vec<Bucket> {
diff --git a/schist_core/schist_queries/tests/pipes.rs b/schist_core/schist_queries/tests/pipes.rs
index abd5a5e..9203aa3 100644
--- a/schist_core/schist_queries/tests/pipes.rs
+++ b/schist_core/schist_queries/tests/pipes.rs
@@ -6,7 +6,7 @@ use schist_fakes::{
     account::make_fake_account, bucket::make_fake_bucket, pipe::make_fake_pipe_builder,
     transaction::make_fake_transaction_builder,
 };
-use schist_models::{account::Account, bucket::Bucket, transaction::Transaction};
+use schist_models::{Account, Bucket, Transaction};
 use schist_queries as queries;
 
 fn given_accounts(connection: &mut SqliteConnection) -> Vec<Account> {