Merge branch 'main' into feat/shuttle-gateway

Satellite-im · Oct 13, 2023 · 98312ff · 98312ff
2 parents 922ad98 + efbc292
commit 98312ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/extensions/warp-ipfs/src/store/document.rs b/extensions/warp-ipfs/src/store/document.rs
@@ -133,19 +133,18 @@ pub struct RootDocument {
 
 impl RootDocument {
     #[tracing::instrument(skip(self, did))]
-    pub fn sign(&mut self, did: &DID) -> Result<(), Error> {
-        let mut root_document = self.clone();
+    pub fn sign(mut self, did: &DID) -> Result<Self, Error> {
         //In case there is a signature already exist
-        root_document.signature = None;
-        if root_document.created.is_none() {
-            root_document.created = Some(Utc::now());
+        self.signature = None;
+        if self.created.is_none() {
+            self.created = Some(Utc::now());
         }
-        root_document.modified = Some(Utc::now());
+        self.modified = Some(Utc::now());
 
-        let bytes = serde_json::to_vec(&root_document)?;
+        let bytes = serde_json::to_vec(&self)?;
         let signature = did.sign(&bytes);
         self.signature = Some(bs58::encode(signature).into_string());
-        Ok(())
+        Ok(self)
     }
 
     #[tracing::instrument(skip(self, ipfs))]
@@ -254,7 +253,7 @@ impl RootDocument {
             .then_some(data.request.to_cid(ipfs).await.ok())
             .flatten();
 
-        let mut root_document = RootDocument {
+        let root_document = RootDocument {
             identity,
             created: Some(data.created),
             modified: Some(data.modified),
@@ -265,7 +264,7 @@ impl RootDocument {
             status: None,
             signature: None,
         };
-        root_document.sign(&did_kp)?;
+        let root_document = root_document.sign(&did_kp)?;
 
         Ok(root_document)
     }

diff --git a/extensions/warp-ipfs/src/store/document/root.rs b/extensions/warp-ipfs/src/store/document/root.rs
@@ -354,10 +354,10 @@ impl RootDocumentTask {
         Ok(document)
     }
 
-    async fn set_root_document(&mut self, mut document: RootDocument) -> Result<(), Error> {
+    async fn set_root_document(&mut self, document: RootDocument) -> Result<(), Error> {
         let old_cid = self.cid;
 
-        document.sign(&self.keypair)?;
+        let document = document.sign(&self.keypair)?;
 
         //Precautionary check
         document.verify(&self.ipfs).await?;