Handle old approach to grant datacap (#241)

Co-authored-by: Filip Lelek <[email protected]>
filecoin-project · Nov 4, 2024 · 72d0e0d · 72d0e0d
1 parent 153d0fb
commit 72d0e0d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/fplus-http-server/src/router/application.rs b/fplus-http-server/src/router/application.rs
@@ -1,6 +1,6 @@
 use actix_web::{get, post, web, HttpResponse, Responder};
 use fplus_lib::core::{
-    application::file::{StorageProviderChangeVerifier, VerifierGrantDataCapCids, VerifierInput},
+    application::file::{StorageProviderChangeVerifier, VerifierInput},
     ApplicationQueryParams, BranchDeleteInfo, CompleteGovernanceReviewInfo,
     CompleteNewApplicationApprovalInfo, CompleteNewApplicationProposalInfo, CreateApplicationInfo,
     DcReachedInfo, GithubQueryParams, LDNApplication, MoreInfoNeeded, NotifyRefillInfo,
@@ -116,10 +116,8 @@ pub async fn propose(
         github_username: query.github_username.clone(), // Use the provided `github_username` parameter
         signing_address: signer.signing_address,
         created_at: signer.created_at,
-        message_cids: VerifierGrantDataCapCids {
-            message_cid: signer.message_cids.message_cid,
-            increase_allowance_cid: signer.message_cids.increase_allowance_cid,
-        },
+        message_cid: signer.message_cids.message_cid,
+        increase_allowance_cid: signer.message_cids.increase_allowance_cid,
     };
     match ldn_application
         .complete_new_application_proposal(
@@ -230,10 +228,8 @@ pub async fn approve(
         github_username: query.github_username.clone(), // Use the provided `github_username` parameter
         signing_address: signer.signing_address,
         created_at: signer.created_at,
-        message_cids: VerifierGrantDataCapCids {
-            message_cid: signer.message_cids.message_cid,
-            increase_allowance_cid: signer.message_cids.increase_allowance_cid,
-        },
+        message_cid: signer.message_cids.message_cid,
+        increase_allowance_cid: signer.message_cids.increase_allowance_cid,
     };
     match ldn_application
         .complete_new_application_approval(

diff --git a/fplus-lib/src/core/application/file.rs b/fplus-lib/src/core/application/file.rs
@@ -406,7 +406,8 @@ pub struct VerifierInput {
     pub github_username: String,
     pub signing_address: String,
     pub created_at: String,
-    pub message_cids: VerifierGrantDataCapCids,
+    pub message_cid: String,
+    pub increase_allowance_cid: Option<String>,
 }
 
 impl From<VerifierInput> for Verifier {
@@ -415,7 +416,8 @@ impl From<VerifierInput> for Verifier {
             github_username: input.github_username,
             signing_address: input.signing_address,
             created_at: input.created_at,
-            message_cids: input.message_cids,
+            message_cid: input.message_cid,
+            increase_allowance_cid: input.increase_allowance_cid,
         }
     }
 }
@@ -428,12 +430,6 @@ pub struct Verifier {
     pub signing_address: String,
     #[serde(rename = "Created At")]
     pub created_at: String,
-    #[serde(rename = "Message CIDs")]
-    pub message_cids: VerifierGrantDataCapCids,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct VerifierGrantDataCapCids {
     #[serde(rename = "Message CID")]
     pub message_cid: String,
     #[serde(

diff --git a/fplus-lib/src/core/mod.rs b/fplus-lib/src/core/mod.rs
@@ -3446,8 +3446,8 @@ _(OLD vs NEW)_
 
             if let Some(first_verifier) = allocation.signers.0.first() {
                 signing_address.clone_from(&first_verifier.signing_address);
-                message_cid.clone_from(&first_verifier.message_cids.message_cid);
-                increase_allowance_cid = first_verifier.message_cids.increase_allowance_cid.clone();
+                message_cid.clone_from(&first_verifier.message_cid);
+                increase_allowance_cid = first_verifier.increase_allowance_cid.clone();
             }
         }