Merge pull request #2599 from b-zee/refactor-upload-deterministic-arc…

…hive refactor(autonomi): deterministic archive
maidsafe · Jan 8, 2025 · 6f94a1e · 6f94a1e
2 parents 1b8c719 + 5b62f1c
commit 6f94a1e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
@@ -98,14 +98,14 @@ jobs:
           ls -l $ANT_DATA_PATH/client_first/logs
           mkdir $ANT_DATA_PATH/client
           ls -l $ANT_DATA_PATH
-          cp ./the-test-data.zip ./the-test-data_1.zip
-          ./target/release/ant --log-output-dest=data-dir file upload "./the-test-data_1.zip" > ./second_upload 2>&1
+          ./target/release/ant --log-output-dest=data-dir file upload --public "./the-test-data.zip" > ./upload_output_second 2>&1
+          rg 'Total cost: 0 AttoTokens' ./upload_output_second -c --stats
         env:
           ANT_LOG: "all"
         timeout-minutes: 25
 
       - name: showing the second upload terminal output
-        run: cat second_upload
+        run: cat upload_output_second
         shell: bash
         if: always()
 

diff --git a/autonomi/src/client/files/archive.rs b/autonomi/src/client/files/archive.rs
@@ -7,7 +7,7 @@
 // permissions and limitations relating to use of the SAFE Network Software.
 
 use std::{
-    collections::HashMap,
+    collections::BTreeMap,
     path::{Path, PathBuf},
 };
 
@@ -36,8 +36,6 @@ pub enum RenameError {
 /// Metadata for a file in an archive. Time values are UNIX timestamps.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Metadata {
-    /// When the file was (last) uploaded to the network.
-    pub uploaded: u64,
     /// File creation time on local file system. See [`std::fs::Metadata::created`] for details per OS.
     pub created: u64,
     /// Last file modification time taken from local file system. See [`std::fs::Metadata::modified`] for details per OS.
@@ -55,7 +53,6 @@ impl Metadata {
             .as_secs();
 
         Self {
-            uploaded: now,
             created: now,
             modified: now,
             size,
@@ -68,15 +65,15 @@ impl Metadata {
 /// The data maps are stored within this structure instead of uploading them to the network, keeping the data private.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
 pub struct PrivateArchive {
-    map: HashMap<PathBuf, (DataMapChunk, Metadata)>,
+    map: BTreeMap<PathBuf, (DataMapChunk, Metadata)>,
 }
 
 impl PrivateArchive {
     /// Create a new emtpy local archive
     /// Note that this does not upload the archive to the network
     pub fn new() -> Self {
         Self {
-            map: HashMap::new(),
+            map: BTreeMap::new(),
         }
     }
 
@@ -130,7 +127,7 @@ impl PrivateArchive {
     }
 
     /// Get the underlying map
-    pub fn map(&self) -> &HashMap<PathBuf, (DataMapChunk, Metadata)> {
+    pub fn map(&self) -> &BTreeMap<PathBuf, (DataMapChunk, Metadata)> {
         &self.map
     }
 

diff --git a/autonomi/src/client/files/archive_public.rs b/autonomi/src/client/files/archive_public.rs
@@ -7,7 +7,7 @@
 // permissions and limitations relating to use of the SAFE Network Software.
 
 use std::{
-    collections::HashMap,
+    collections::BTreeMap,
     path::{Path, PathBuf},
 };
 
@@ -34,15 +34,15 @@ pub type ArchiveAddr = XorName;
 /// to the network, of which the addresses are stored in this archive.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
 pub struct PublicArchive {
-    map: HashMap<PathBuf, (DataAddr, Metadata)>,
+    map: BTreeMap<PathBuf, (DataAddr, Metadata)>,
 }
 
 impl PublicArchive {
     /// Create a new emtpy local archive
     /// Note that this does not upload the archive to the network
     pub fn new() -> Self {
         Self {
-            map: HashMap::new(),
+            map: BTreeMap::new(),
         }
     }
 
@@ -92,7 +92,7 @@ impl PublicArchive {
     }
 
     /// Get the underlying map
-    pub fn map(&self) -> &HashMap<PathBuf, (DataAddr, Metadata)> {
+    pub fn map(&self) -> &BTreeMap<PathBuf, (DataAddr, Metadata)> {
         &self.map
     }
 

diff --git a/autonomi/src/client/files/fs_public.rs b/autonomi/src/client/files/fs_public.rs
@@ -194,7 +194,6 @@ pub(crate) fn metadata_from_entry(entry: &walkdir::DirEntry) -> Metadata {
                 entry.path().display()
             );
             return Metadata {
-                uploaded: 0,
                 created: 0,
                 modified: 0,
                 size: 0,
@@ -224,10 +223,6 @@ pub(crate) fn metadata_from_entry(entry: &walkdir::DirEntry) -> Metadata {
     let modified = unix_time("modified", fs_metadata.modified());
 
     Metadata {
-        uploaded: SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .unwrap_or(Duration::from_secs(0))
-            .as_secs(),
         created,
         modified,
         size: fs_metadata.len(),