fix: minor improvements to sync

Author: ErikBjare

aw-sync/src/sync.rs

@@ -135,6 +135,7 @@ fn create_datastore(dspath: &PathBuf) -> Datastore {
     Datastore::new(pathstr, false)
 }
 
+// TODO: Move into tests
 fn setup_test(sync_directory: &Path) -> std::io::Result<Vec<Datastore>> {
     let mut datastores: Vec<Datastore> = Vec::new();
     for n in 0..2 {
@@ -238,7 +239,7 @@ pub fn sync_datastores(
     ds_to: &dyn AccessMethod,
     is_push: bool,
     src_did: Option<&str>,
-    buckets: &Vec<String>,
+    buckets: &[String],
 ) {
     // FIXME: "-synced" should only be appended when synced to the local database, not to the
     // staging area for local buckets.
@@ -258,7 +259,7 @@ pub fn sync_datastores(
         })
         // If buckets vec isn't empty, filter out buckets not in the buckets vec
         .filter(|bucket| {
-            if buckets.len() > 0 {
+            if buckets.is_empty() {
                 buckets.iter().any(|b_id| b_id == &bucket.id)
             } else {
                 true

aw-sync/tests/sync.rs

@@ -101,7 +101,7 @@ mod sync_tests {
         let state = init_teststate();
         create_bucket(&state.ds_src, 0);
 
-        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &vec![]);
+        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &[]);
 
         let buckets_src: HashMap<String, Bucket> = state.ds_src.get_buckets().unwrap();
         let buckets_dest: HashMap<String, Bucket> = state.ds_dest.get_buckets().unwrap();
@@ -136,7 +136,7 @@ mod sync_tests {
             .heartbeat(bucket_id.as_str(), create_event("1"), 1.0)
             .unwrap();
 
-        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &vec![]);
+        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &[]);
 
         let all_datastores: Vec<&Datastore> =
             [&state.ds_src, &state.ds_dest].iter().cloned().collect();
@@ -150,7 +150,7 @@ mod sync_tests {
             .ds_src
             .heartbeat(bucket_id.as_str(), create_event("1"), 1.0)
             .unwrap();
-        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &vec![]);
+        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &[]);
 
         // Check again that new events were indeed synced
         check_synced_buckets_equal_to_src(&all_buckets_map);
@@ -163,7 +163,7 @@ mod sync_tests {
         let bucket_id = create_bucket(&state.ds_src, 0);
         create_events(&state.ds_src, bucket_id.as_str(), 10);
 
-        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &vec![]);
+        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &[]);
 
         let all_datastores: Vec<&Datastore> =
             [&state.ds_src, &state.ds_dest].iter().cloned().collect();
@@ -174,7 +174,7 @@ mod sync_tests {
 
         // Add some more events
         create_events(&state.ds_src, bucket_id.as_str(), 10);
-        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &vec![]);
+        aw_sync::sync_datastores(&state.ds_src, &state.ds_dest, false, None, &[]);
 
         // Check again that new events were indeed synced
         check_synced_buckets_equal_to_src(&all_buckets_map);