Merge pull request #36 from filecoin-project/feat/add-fields-to-json

Add username to signers & add weekly_allocation.
filecoin-project · Oct 11, 2023 · 505e74b · 505e74b
2 parents e7a9adb + 8fe902e
commit 505e74b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/fplus-lib/src/core/application/allocations.rs b/fplus-lib/src/core/application/allocations.rs
@@ -3,7 +3,7 @@ pub struct ApplicationAllocationsSigner {
     pub signing_address: String,
     pub time_of_signature: String,
     pub message_cid: String,
-    // username //TODO:STOJAN
+    pub username: String
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]

diff --git a/fplus-lib/src/core/application/core_info.rs b/fplus-lib/src/core/application/core_info.rs
@@ -14,6 +14,7 @@ pub struct ApplicationCoreInfo {
     pub data_owner_region: String,
     pub data_owner_industry: String,
     pub data_owner_address: String,
+    pub datacap_weekly_allocation: String,
     pub requested_amount: String,
     pub website: String,
     pub social_media: String,
@@ -27,7 +28,7 @@ impl ApplicationCoreInfo {
         data_owner_industry: String,
         data_owner_address: String,
         requested_amount: String,
-        // datacap_weekly_allocation: String  //TODO:STOJAN
+        datacap_weekly_allocation: String,
         website: String,
         social_media: String,
     ) -> Self {
@@ -37,6 +38,7 @@ impl ApplicationCoreInfo {
             data_owner_github_handle,
             data_owner_address,
             requested_amount,
+            datacap_weekly_allocation,
             data_owner_industry,
             website,
             social_media,

diff --git a/fplus-lib/src/core/mod.rs b/fplus-lib/src/core/mod.rs
@@ -265,6 +265,7 @@ impl LDNApplication {
                     "TODO".to_string(), // industry
                     parsed_ldn.address,
                     parsed_ldn.datacap_requested,
+                    parsed_ldn.datacap_weekly_allocation,
                     parsed_ldn.website,
                     "TODO".to_string(), // social media
                 );
@@ -887,6 +888,7 @@ mod tests {
                     signing_address: "signing_address".to_string(),
                     time_of_signature: "time_of_signature".to_string(),
                     message_cid: "message_cid".to_string(),
+                    username: "gh_username".to_string(),
                 },
             })
             .await
@@ -910,6 +912,7 @@ mod tests {
                     signing_address: "signing_address".to_string(),
                     time_of_signature: "time_of_signature".to_string(),
                     message_cid: "message_cid".to_string(),
+                    username: "gh_username".to_string(),
                 },
             })
             .await