Merge pull request #34 from Sajjon/match_ret

Rename DepositorAddress -> ResourceOrNonFungible, which is the name o…

profile/src/v100/entity/account/account.rs

@@ -303,8 +303,9 @@ mod tests {
 
     use crate::{
         assert_eq_after_json_roundtrip, AssetException,
-        DepositAddressExceptionRule, DepositRule, DepositorAddress, EntityFlag,
-        EntityFlags, HasPlaceholder, OnLedgerSettings, ThirdPartyDeposits,
+        DepositAddressExceptionRule, DepositRule, EntityFlag, EntityFlags,
+        HasPlaceholder, OnLedgerSettings, ResourceOrNonFungible,
+        ThirdPartyDeposits,
     };
     use identified_vec::IsIdentifiedVec;
     use radix_engine_common::prelude::HashSet;
@@ -383,7 +384,7 @@ mod tests {
         let new_third_party_dep = ThirdPartyDeposits::with_rule_and_lists(
             DepositRule::DenyAll,
             [excp1, excp2],
-            [DepositorAddress::Resource {
+            [ResourceOrNonFungible::Resource {
                 value: "resource_rdx1tkk83magp3gjyxrpskfsqwkg4g949rmcjee4tu2xmw93ltw2cz94sq"
                     .parse()
                     .unwrap(),

profile/src/v100/entity/account/on_ledger_settings/on_ledger_settings.rs

@@ -101,7 +101,7 @@ mod tests {
             DepositRule::DenyAll,
             Vec::from_iter([excp1, excp2]),
             Vec::from_iter(
-                [DepositorAddress::Resource {
+                [ResourceOrNonFungible::Resource {
                     value: "resource_rdx1tkk83magp3gjyxrpskfsqwkg4g949rmcjee4tu2xmw93ltw2cz94sq"
                         .parse()
                         .unwrap(),

profile/src/v100/entity/account/on_ledger_settings/third_party_deposits/mod.rs

@@ -1,11 +1,11 @@
 mod asset_exception;
 mod deposit_address_exception_rule;
 mod deposit_rule;
-mod depositor_address;
+mod resource_or_non_fungible;
 mod third_party_deposits;
 
 pub use asset_exception::*;
 pub use deposit_address_exception_rule::*;
 pub use deposit_rule::*;
-pub use depositor_address::*;
+pub use resource_or_non_fungible::*;
 pub use third_party_deposits::*;

profile/src/v100/entity/account/on_ledger_settings/third_party_deposits/depositor_address.rs → profile/src/v100/entity/account/on_ledger_settings/third_party_deposits/resource_or_non_fungible.rs

@@ -14,11 +14,11 @@ use crate::prelude::*;
     uniffi::Enum,
 )]
 #[serde(tag = "discriminator")]
-pub enum DepositorAddress {
+pub enum ResourceOrNonFungible {
     #[serde(rename = "resourceAddress")]
     Resource { value: ResourceAddress },
     #[serde(rename = "nonFungibleGlobalID")]
-    NFGlobalID { value: NonFungibleGlobalId },
+    NonFungible { value: NonFungibleGlobalId },
 }
 
 #[cfg(test)]
@@ -27,7 +27,7 @@ mod tests {
     #[test]
     fn json_decode_deny_all_with_exceptions() {
         let model =
-            DepositorAddress::Resource {
+            ResourceOrNonFungible::Resource {
                 value: "resource_rdx1tkk83magp3gjyxrpskfsqwkg4g949rmcjee4tu2xmw93ltw2cz94sq"
                     .parse()
                     .unwrap(),

profile/src/v100/entity/account/on_ledger_settings/third_party_deposits/third_party_deposits.rs

@@ -15,7 +15,7 @@ pub struct ThirdPartyDeposits {
 
     /// Allows certain third-party depositors to deposit assets freely.
     /// Note: There is no `deny` counterpart for this.
-    pub depositors_allow_list: IdentifiedVecVia<DepositorAddress>,
+    pub depositors_allow_list: IdentifiedVecVia<ResourceOrNonFungible>,
 }
 
 impl Default for ThirdPartyDeposits {
@@ -24,7 +24,7 @@ impl Default for ThirdPartyDeposits {
     }
 }
 
-impl Identifiable for DepositorAddress {
+impl Identifiable for ResourceOrNonFungible {
     type ID = Self;
 
     fn id(&self) -> Self::ID {
@@ -53,7 +53,7 @@ impl ThirdPartyDeposits {
     ) -> Self
     where
         I: IntoIterator<Item = AssetException>,
-        J: IntoIterator<Item = DepositorAddress>,
+        J: IntoIterator<Item = ResourceOrNonFungible>,
     {
         Self {
             deposit_rule,
@@ -90,14 +90,17 @@ impl ThirdPartyDeposits {
     ///
     /// If the set did not previously contain an equal value, true is returned.
     /// If the set already contained an equal value, false is returned, and the entry is not updated.
-    pub fn allow_depositor(&mut self, depositor: DepositorAddress) -> bool {
+    pub fn allow_depositor(
+        &mut self,
+        depositor: ResourceOrNonFungible,
+    ) -> bool {
         self.depositors_allow_list.append(depositor).0
     }
 
     // If the set contains an element equal to `DepositorAddress`, removes it from the set and drops it. Returns whether such an element was present.
     pub fn remove_allowed_depositor(
         &mut self,
-        depositor: &DepositorAddress,
+        depositor: &ResourceOrNonFungible,
     ) -> bool {
         self.depositors_allow_list.remove(depositor).is_some()
     }
@@ -125,7 +128,7 @@ mod tests {
             DepositRule::AcceptKnown,
             BTreeSet::from_iter([excp1, excp2]),
             BTreeSet::from_iter(
-                [DepositorAddress::NFGlobalID { value: "resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha:<foobar>".parse().unwrap()}],
+                [ResourceOrNonFungible::NonFungible { value: "resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha:<foobar>".parse().unwrap()}],
             ),
         );
 
@@ -215,7 +218,7 @@ mod tests {
         )
         .unwrap();
 
-        let depositor = DepositorAddress::NFGlobalID {
+        let depositor = ResourceOrNonFungible::NonFungible {
             value: "resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha:<foobar>"
                 .parse()
                 .unwrap(),