Move ResourcePreferences under ProfileNetwork (#209)

* Move ResourcePreferences under ProfileNetwork * missing tests * Update kt extensions --------- Co-authored-by: Sergiu Puhalschi <[email protected]>
radixdlt · Sep 5, 2024 · 2d0cdb3 · 2d0cdb3
1 parent 284c16b
commit 2d0cdb3
Show file tree

Hide file tree

Showing 20 changed files with 265 additions and 89 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sargon/Cargo.toml b/crates/sargon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "1.1.9"
+version = "1.1.10"
 edition = "2021"
 build = "build.rs"
 

diff --git a/crates/sargon/src/profile/logic/profile_network/profile_network_get_entities.rs b/crates/sargon/src/profile/logic/profile_network/profile_network_get_entities.rs
@@ -35,6 +35,7 @@ mod tests {
             accounts.clone().to_owned(),
             Personas::new(),
             AuthorizedDapps::new(),
+            ResourcePreferences::new(),
         );
         assert_eq!(
             &profile_network.accounts_non_hidden().items(),
@@ -60,6 +61,7 @@ mod tests {
             Accounts::new(),
             personas,
             AuthorizedDapps::new(),
+            ResourcePreferences::new(),
         );
         assert_eq!(
             &sut.personas_non_hidden().items(),

diff --git a/crates/sargon/src/profile/v100/app_preferences/app_preferences.rs b/crates/sargon/src/profile/v100/app_preferences/app_preferences.rs
@@ -31,10 +31,6 @@ pub struct AppPreferences {
 
     /// Default config related to making of transactions
     pub transaction: TransactionPreferences,
-
-    /// Configuration related to resources
-    #[serde(default)]
-    pub resources: ResourcePreferences,
 }
 
 impl AppPreferences {
@@ -45,13 +41,8 @@ impl AppPreferences {
         gateways: {}
         security: {}
         transaction: {}
-        resources: {:?}
         "#,
-            self.display,
-            self.gateways,
-            self.security,
-            self.transaction,
-            self.resources
+            self.display, self.gateways, self.security, self.transaction
         )
     }
 }
@@ -62,14 +53,12 @@ impl AppPreferences {
         gateways: SavedGateways,
         security: Security,
         transaction: TransactionPreferences,
-        resources: ResourcePreferences,
     ) -> Self {
         Self {
             display,
             gateways,
             security,
             transaction,
-            resources,
         }
     }
 }
@@ -82,7 +71,6 @@ impl HasSampleValues for AppPreferences {
             SavedGateways::sample(),
             Security::sample(),
             TransactionPreferences::sample(),
-            ResourcePreferences::sample(),
         )
     }
 
@@ -93,7 +81,6 @@ impl HasSampleValues for AppPreferences {
             SavedGateways::sample_other(),
             Security::sample_other(),
             TransactionPreferences::sample_other(),
-            ResourcePreferences::sample_other(),
         )
     }
 }
@@ -142,11 +129,6 @@ mod tests {
         assert_eq!(SUT::sample().transaction, TransactionPreferences::sample())
     }
 
-    #[test]
-    fn get_resources() {
-        assert_eq!(SUT::sample().resources, ResourcePreferences::sample())
-    }
-
     #[test]
     fn test_has_gateway_with_url() {
         let sut = SUT::sample();
@@ -203,23 +185,7 @@ mod tests {
                 },
                 "transaction": {
                     "defaultDepositGuarantee": "0.975"
-                },
-                "resources": [
-                    {
-                        "resource": {
-                            "kind": "fungible",
-                            "value": "resource_rdx1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxradxrd"
-                        },
-                        "visibility": "hidden"
-                    },
-                    {
-                        "resource": {
-                            "kind": "nonFungible",
-                            "value": "resource_rdx1t4dy69k6s0gv040xa64cyadyefwtett62ng6xfdnljyydnml7t6g3j"
-                        },
-                        "visibility": "visible"
-                    }
-                ]
+                }
             }               
             "#,
         )

diff --git a/crates/sargon/src/profile/v100/app_preferences/mod.rs b/crates/sargon/src/profile/v100/app_preferences/mod.rs
@@ -2,14 +2,12 @@ mod app_display_settings;
 mod app_preferences;
 mod app_preferences_uniffi_fn;
 mod gateways;
-mod resource_preferences;
 mod security;
 mod transaction_preferences;
 
 pub use app_display_settings::*;
 pub use app_preferences::*;
 pub use app_preferences_uniffi_fn::*;
 pub use gateways::*;
-pub use resource_preferences::*;
 pub use security::*;
 pub use transaction_preferences::*;
diff --git a/crates/sargon/src/profile/v100/networks/network/mod.rs b/crates/sargon/src/profile/v100/networks/network/mod.rs
@@ -6,6 +6,7 @@ mod network_id_uniffi_fn;
 mod personas;
 mod profile_network;
 mod profile_network_uniffi_fn;
+mod resource_preferences;
 
 pub use accounts::*;
 pub use authorized_dapp::*;
@@ -15,3 +16,4 @@ pub use network_id_uniffi_fn::*;
 pub use personas::*;
 pub use profile_network::*;
 pub use profile_network_uniffi_fn::*;
+pub use resource_preferences::*;
diff --git a/crates/sargon/src/profile/v100/networks/network/profile_network.rs b/crates/sargon/src/profile/v100/networks/network/profile_network.rs
@@ -33,6 +33,10 @@ pub struct ProfileNetwork {
     /// [`AuthorizedDapp`]s that the user has interacted with.
     #[serde(rename = "authorizedDapps")]
     pub authorized_dapps: AuthorizedDapps,
+
+    /// Configuration related to resources
+    #[serde(default)]
+    pub resource_preferences: ResourcePreferences,
 }
 
 impl IsNetworkAware for ProfileNetwork {
@@ -49,8 +53,13 @@ impl ProfileNetwork {
 			accounts: {}
 			personas: {}
 			authorized_dapps: {}
+			resource_preferences: {:?}
 			"#,
-            self.id, self.accounts, self.personas, self.authorized_dapps,
+            self.id,
+            self.accounts,
+            self.personas,
+            self.authorized_dapps,
+            self.resource_preferences
         )
     }
 }
@@ -76,11 +85,13 @@ impl ProfileNetwork {
         accounts: impl Into<Accounts>,
         personas: impl Into<Personas>,
         authorized_dapps: impl Into<AuthorizedDapps>,
+        resource_preferences: impl Into<ResourcePreferences>,
     ) -> Self {
         let network_id = network_id.into();
         let accounts = accounts.into();
         let personas = personas.into();
         let authorized_dapps = authorized_dapps.into();
+        let resource_preferences = resource_preferences.into();
         assert!(
             accounts
                 .get_all()
@@ -102,11 +113,21 @@ impl ProfileNetwork {
                 .all(|d| d.network_id == network_id),
             "Discrepancy, found an AuthorizedDapp on other network than {network_id}"
         );
+
+        assert!(
+            resource_preferences
+                .get_all()
+                .into_iter()
+                .all(|d| d.network_id() == network_id),
+            "Discrepancy, found a ResourceAppPreference on other network than {network_id}"
+        );
+
         Self {
             id: network_id,
             accounts,
             personas,
             authorized_dapps,
+            resource_preferences,
         }
     }
 
@@ -118,6 +139,7 @@ impl ProfileNetwork {
             Accounts::new(),
             Personas::new(),
             AuthorizedDapps::new(),
+            ResourcePreferences::new(),
         )
     }
 }
@@ -160,6 +182,7 @@ impl ProfileNetwork {
             Accounts::sample_mainnet(),
             Personas::sample_mainnet(),
             AuthorizedDapps::sample_mainnet(),
+            ResourcePreferences::sample_mainnet(),
         )
     }
 
@@ -170,6 +193,7 @@ impl ProfileNetwork {
             Accounts::sample_stokenet(),
             Personas::sample_stokenet(),
             AuthorizedDapps::sample_stokenet(),
+            ResourcePreferences::sample_stokenet(),
         )
     }
 }
@@ -202,6 +226,14 @@ mod tests {
         assert_eq!(sut.accounts, Accounts::sample());
     }
 
+    #[test]
+    fn get_resources() {
+        assert_eq!(
+            SUT::sample().resource_preferences,
+            ResourcePreferences::sample()
+        )
+    }
+
     #[test]
     fn duplicate_accounts_are_filtered_out() {
         assert_eq!(
@@ -212,6 +244,7 @@ mod tests {
                 ),
                 Personas::default(),
                 AuthorizedDapps::default(),
+                ResourcePreferences::default(),
             )
             .accounts
             .len(),
@@ -229,6 +262,7 @@ mod tests {
             Accounts::just(Account::sample_stokenet()),
             Personas::default(),
             AuthorizedDapps::default(),
+            ResourcePreferences::default(),
         );
     }
 
@@ -242,6 +276,7 @@ mod tests {
             Accounts::sample_mainnet(),
             Personas::just(Persona::sample_stokenet()),
             AuthorizedDapps::default(),
+            ResourcePreferences::default(),
         );
     }
 
@@ -255,6 +290,23 @@ mod tests {
             Accounts::sample_mainnet(),
             Personas::sample_mainnet(),
             AuthorizedDapps::just(AuthorizedDapp::sample_stokenet()),
+            ResourcePreferences::default(),
+        );
+    }
+
+    #[test]
+    #[should_panic(
+        expected = "Discrepancy, found a ResourceAppPreference on other network than mainnet"
+    )]
+    fn panic_when_network_id_mismatch_between_resource_preferences_and_value() {
+        SUT::new(
+            NetworkID::Mainnet,
+            Accounts::sample_mainnet(),
+            Personas::sample_mainnet(),
+            AuthorizedDapps::sample_mainnet(),
+            ResourcePreferences::from_iter([
+                ResourceAppPreference::sample_non_fungible_stokenet(),
+            ]),
         );
     }
 
@@ -604,7 +656,23 @@ mod tests {
 							}
 						]
 					}
-				]
+				],
+                "resource_preferences": [
+                    {
+                        "resource": {
+                            "kind": "fungible",
+                            "value": "resource_rdx1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxradxrd"
+                        },
+                        "visibility": "hidden"
+                    },
+                    {
+                        "resource": {
+                            "kind": "nonFungible",
+                            "value": "resource_rdx1t4dy69k6s0gv040xa64cyadyefwtett62ng6xfdnljyydnml7t6g3j"
+                        },
+                        "visibility": "visible"
+                    }
+                ]
 			}
             "#,
         );
@@ -950,7 +1018,16 @@ mod tests {
 							}
 						]
 					}
-				]
+				],
+                "resource_preferences": [
+                    {
+                        "resource": {
+                            "kind": "nonFungible",
+                            "value": "resource_tdx_2_1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxtfd2jc"
+                        },
+                        "visibility": "visible"
+                    }
+                ]
 			}
             "#,
         )

diff --git a/.../resource_preferences/hidden_resources.rs → .../resource_preferences/hidden_resources.rs b/.../resource_preferences/hidden_resources.rs → .../resource_preferences/hidden_resources.rs
diff --git a/...p_preferences/resource_preferences/mod.rs → ...works/network/resource_preferences/mod.rs b/...p_preferences/resource_preferences/mod.rs → ...works/network/resource_preferences/mod.rs