fix: client carry out merge when verify register storage

maidsafe · Oct 26, 2023 · ad104d5 · ad104d5
1 parent c7b7f12
commit ad104d5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/sn_client/src/api.rs b/sn_client/src/api.rs
@@ -281,8 +281,8 @@ impl Client {
             .await;
         let record = match maybe_record {
             Ok(r) => r,
-            Err(NetworkError::SplitRecord(map)) => {
-                return merge_split_register_records(address, &map)
+            Err(NetworkError::SplitRecord { result_map }) => {
+                return merge_split_register_records(address, &result_map)
             }
             Err(e) => {
                 warn!("Failed to get record at {address:?} from the network: {e:?}");
@@ -442,19 +442,7 @@ impl Client {
     /// Verify if a `Register` is stored by expected nodes on the network.
     pub async fn verify_register_stored(&self, address: RegisterAddress) -> Result<SignedRegister> {
         info!("Verifying register: {address:?}");
-        let key = NetworkAddress::from_register_address(address).to_record_key();
-        let record = self
-            .network
-            .get_record_from_network(key, None, GetQuorum::All, false, Default::default())
-            .await?;
-
-        let header = RecordHeader::from_record(&record)?;
-        if let RecordKind::Register = header.kind {
-            let register = get_register_from_record(record)?;
-            Ok(register)
-        } else {
-            Err(ProtocolError::RecordKindMismatch(RecordKind::Register).into())
-        }
+        self.get_signed_register_from_network(address).await
     }
 
     /// Send a `SpendCashNote` request to the network

diff --git a/sn_networking/src/error.rs b/sn_networking/src/error.rs
@@ -112,8 +112,11 @@ pub enum Error {
     #[error("Gossipsub subscribe Error: {0}")]
     GossipsubSubscriptionError(#[from] SubscriptionError),
 
-    #[error("Split Record: {0:?}")]
-    SplitRecord(HashMap<XorName, (Record, HashSet<PeerId>)>),
+    // Avoid logging the whole `Record` content by accident
+    #[error("Split Record has {} different copies", result_map.len())]
+    SplitRecord {
+        result_map: HashMap<XorName, (Record, HashSet<PeerId>)>,
+    },
 
     #[error("Record header is incorrect")]
     InCorrectRecordHeader,

diff --git a/sn_networking/src/event.rs b/sn_networking/src/event.rs
@@ -1025,7 +1025,7 @@ impl SwarmDriver {
                     let _ = sender.send(result);
                 } else {
                     debug!("For record {pretty_key:?} task {query_id:?}, fetch completed with split record");
-                    let _ = sender.send(Err(Error::SplitRecord(result_map)));
+                    let _ = sender.send(Err(Error::SplitRecord { result_map }));
                 }
             } else {
                 let _ = self

diff --git a/sn_networking/src/lib.rs b/sn_networking/src/lib.rs
@@ -370,7 +370,8 @@ impl Network {
                     warn!("No holder of record '{pretty_key:?}' found. Retrying the fetch ...",);
                 }
                 Err(error) => {
-                    error!("{error:?}");
+                    error!("Getting record {pretty_key:?} attempts #{verification_attempts}/{total_attempts} , encountered {error:?}");
+
                     if verification_attempts >= total_attempts {
                         break;
                     }