Use BoundedBTreeSet for list of portfolios. (#1733)

* Use BoundedBTreeSet for list of portfolios. * Export constant. --------- Co-authored-by: Adam Dossa <[email protected]>
PolymeshAssociation · Oct 21, 2024 · 6a40d4b · 6a40d4b
1 parent 2474e84
commit 6a40d4b
Show file tree

Hide file tree

Showing 15 changed files with 192 additions and 148 deletions.
diff --git a/pallets/runtime/common/src/runtime.rs b/pallets/runtime/common/src/runtime.rs
@@ -482,6 +482,7 @@ macro_rules! misc_pallet_impls {
             type MaxNumberOfNFTsPerLeg = MaxNumberOfNFTsPerLeg;
             type MaxNumberOfNFTs = MaxNumberOfNFTs;
             type MaxNumberOfOffChainAssets = MaxNumberOfOffChainAssets;
+            type MaxNumberOfPortfolios = MaxNumberOfPortfolios;
             type MaxNumberOfVenueSigners = MaxNumberOfVenueSigners;
             type MaxInstructionMediators = MaxInstructionMediators;
         }

diff --git a/pallets/runtime/develop/src/runtime.rs b/pallets/runtime/develop/src/runtime.rs
@@ -93,6 +93,7 @@ parameter_types! {
     pub const MaxNumberOfFungibleAssets: u32 = 10;
     pub const MaxNumberOfNFTsPerLeg: u32 = 10;
     pub const MaxNumberOfNFTs: u32 = 100;
+    pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
 

diff --git a/pallets/runtime/mainnet/src/runtime.rs b/pallets/runtime/mainnet/src/runtime.rs
@@ -89,6 +89,7 @@ parameter_types! {
     pub const MaxNumberOfFungibleAssets: u32 = 10;
     pub const MaxNumberOfNFTsPerLeg: u32 = 10;
     pub const MaxNumberOfNFTs: u32 = 100;
+    pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
 

diff --git a/pallets/runtime/testnet/src/runtime.rs b/pallets/runtime/testnet/src/runtime.rs
@@ -92,6 +92,7 @@ parameter_types! {
     pub const MaxNumberOfFungibleAssets: u32 = 10;
     pub const MaxNumberOfNFTsPerLeg: u32 = 10;
     pub const MaxNumberOfNFTs: u32 = 100;
+    pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
 

diff --git a/pallets/runtime/tests/src/asset_pallet/base_transfer.rs b/pallets/runtime/tests/src/asset_pallet/base_transfer.rs
@@ -11,7 +11,7 @@ use polymesh_primitives::{
 };
 
 use super::setup::{create_and_issue_sample_asset, create_and_issue_sample_nft, ISSUE_AMOUNT};
-use crate::storage::User;
+use crate::storage::{default_portfolio_btreeset, User};
 use crate::{ExtBuilder, TestStorage};
 
 type Asset = pallet_asset::Module<TestStorage>;
@@ -229,7 +229,7 @@ fn base_transfer_locked_asset() {
                 asset_id,
                 amount: ISSUE_AMOUNT,
             }],
-            vec![alice_default_portfolio],
+            default_portfolio_btreeset(alice.did),
             None,
         ));
         let mut weight_meter = WeightMeter::max_limit_no_minimum();

diff --git a/pallets/runtime/tests/src/asset_pallet/controller_transfer.rs b/pallets/runtime/tests/src/asset_pallet/controller_transfer.rs
@@ -8,7 +8,7 @@ use polymesh_primitives::settlement::{
 use polymesh_primitives::{AuthorizationData, PortfolioId, PortfolioKind, Signatory};
 
 use super::setup::{create_and_issue_sample_asset, ISSUE_AMOUNT};
-use crate::storage::User;
+use crate::storage::{default_portfolio_btreeset, User};
 use crate::{ExtBuilder, TestStorage};
 
 type Asset = pallet_asset::Module<TestStorage>;
@@ -71,7 +71,7 @@ fn controller_transfer_locked_asset() {
         assert_ok!(Settlement::affirm_instruction(
             alice.origin(),
             InstructionId(0),
-            vec![alice_default_portfolio]
+            default_portfolio_btreeset(alice.did),
         ),);
 
         // Controller transfer should fail since the tokens are locked

diff --git a/pallets/runtime/tests/src/asset_test.rs b/pallets/runtime/tests/src/asset_test.rs
@@ -56,8 +56,8 @@ use crate::asset_pallet::setup::{
 use crate::ext_builder::ExtBuilder;
 use crate::nft::create_nft_collection;
 use crate::storage::{
-    add_secondary_key, add_secondary_key_with_perms, register_keyring_account, root, Checkpoint,
-    TestStorage, User,
+    add_secondary_key, add_secondary_key_with_perms, default_portfolio_btreeset,
+    register_keyring_account, root, Checkpoint, TestStorage, User,
 };
 
 type BaseError = pallet_base::Error<TestStorage>;
@@ -1954,7 +1954,7 @@ fn controller_transfer_locked_asset() {
         assert_ok!(Settlement::affirm_instruction(
             alice.origin(),
             InstructionId(0),
-            vec![alice_default_portfolio]
+            default_portfolio_btreeset(alice.did),
         ),);
 
         // Controller transfer should fail since the tokens are locked

diff --git a/pallets/runtime/tests/src/nft.rs b/pallets/runtime/tests/src/nft.rs
@@ -26,7 +26,7 @@ use sp_keyring::AccountKeyring;
 use super::asset_test::{get_asset_details, set_timestamp};
 use crate::asset_pallet::setup::{create_and_issue_sample_asset, create_and_issue_sample_nft};
 use crate::ext_builder::ExtBuilder;
-use crate::storage::{TestStorage, User};
+use crate::storage::{default_portfolio_btreeset, TestStorage, User};
 
 type Asset = pallet_asset::Module<TestStorage>;
 type ComplianceManager = pallet_compliance_manager::Module<TestStorage>;
@@ -1179,7 +1179,7 @@ fn redeem_locked_nft() {
             None,
             None,
             legs,
-            vec![PortfolioId::default_portfolio(alice.did)],
+            default_portfolio_btreeset(alice.did),
             None,
         ));
 
@@ -1221,7 +1221,7 @@ fn reject_instruction_with_locked_asset() {
             None,
             None,
             legs,
-            vec![PortfolioId::default_portfolio(alice.did)],
+            default_portfolio_btreeset(alice.did),
             None,
         ));
 

diff --git a/pallets/runtime/tests/src/portfolio.rs b/pallets/runtime/tests/src/portfolio.rs
@@ -22,7 +22,7 @@ use sp_keyring::AccountKeyring;
 use super::asset_pallet::setup::{create_and_issue_sample_asset, ISSUE_AMOUNT};
 use super::asset_test::max_len_bytes;
 use super::nft::{create_nft_collection, mint_nft};
-use super::storage::{EventTest, System, TestStorage, User};
+use super::storage::{user_portfolio_btreeset, EventTest, System, TestStorage, User};
 use super::ExtBuilder;
 
 type Asset = pallet_asset::Module<TestStorage>;
@@ -683,7 +683,7 @@ fn delete_portfolio_with_locked_nfts() {
             None,
             None,
             legs,
-            vec![PortfolioId::user_portfolio(alice.did, PortfolioNumber(1))],
+            user_portfolio_btreeset(alice.did, PortfolioNumber(1)),
             Some(Memo::default()),
         ));
 

diff --git a/pallets/runtime/tests/src/settlement_pallet/execute_instruction.rs b/pallets/runtime/tests/src/settlement_pallet/execute_instruction.rs
@@ -16,7 +16,7 @@ use polymesh_primitives::PortfolioId;
 
 use super::setup::create_and_issue_sample_asset_with_venue;
 use crate::asset_pallet::setup::create_and_issue_sample_asset;
-use crate::storage::User;
+use crate::storage::{default_portfolio_btreeset, User};
 use crate::{next_block, ExtBuilder, TestStorage};
 
 type Settlement = pallet_settlement::Module<TestStorage>;
@@ -50,12 +50,12 @@ fn execute_instruction_storage_pruning() {
         assert_ok!(Settlement::affirm_instruction(
             alice.origin(),
             instruction_id,
-            vec![alice_default_portfolio]
+            default_portfolio_btreeset(alice.did),
         ));
         assert_ok!(Settlement::affirm_instruction(
             bob.origin(),
             instruction_id,
-            vec![bob_default_portfolio]
+            default_portfolio_btreeset(bob.did),
         ));
         next_block();
 
@@ -144,12 +144,12 @@ fn execute_instruction_storage_rollback() {
         assert_ok!(Settlement::affirm_instruction(
             alice.origin(),
             instruction_id,
-            vec![alice_default_portfolio]
+            default_portfolio_btreeset(alice.did),
         ));
         assert_ok!(Settlement::affirm_instruction(
             bob.origin(),
             instruction_id,
-            vec![bob_default_portfolio]
+            default_portfolio_btreeset(bob.did),
         ));
         // Removes asset_id2 balance to force an error
         BalanceOf::insert(asset_id2, alice.did, 0);