Restrict number of namespaces to one (#385)

* remove ability to have multiple namespaces * remove namespace filter * fix test
AbstractSDK · Jul 2, 2023 · c145ba0 · c145ba0
1 parent 17bc0fd
commit c145ba0
Show file tree

Hide file tree

Showing 10 changed files with 200 additions and 347 deletions.
diff --git a/contracts/account/manager/tests/adapters.rs b/contracts/account/manager/tests/adapters.rs
@@ -219,7 +219,7 @@ fn reinstalling_new_version_should_install_latest() -> AResult {
     let account = create_default_account(&deployment.account_factory)?;
     deployment
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec!["tester".to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, "tester".to_string())?;
 
     let adapter1 = BootMockAdapter1V1::new_test(chain.clone());
     adapter1.deploy(V1.parse().unwrap(), MockInitMsg).unwrap();
@@ -339,7 +339,7 @@ fn installing_specific_version_should_install_expected() -> AResult {
     let account = create_default_account(&deployment.account_factory)?;
     deployment
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec!["tester".to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, "tester".to_string())?;
 
     let adapter1 = BootMockAdapter1V1::new_test(chain.clone());
     adapter1.deploy(V1.parse().unwrap(), MockInitMsg).unwrap();

diff --git a/contracts/account/manager/tests/common/mod.rs b/contracts/account/manager/tests/common/mod.rs
@@ -43,7 +43,7 @@ pub(crate) fn init_mock_adapter(
 ) -> anyhow::Result<BootMockAdapter<Mock>> {
     deployment
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec!["tester".to_string()]);
+        .claim_namespace(TEST_ACCOUNT_ID, "tester".to_string());
     let mut staking_adapter = BootMockAdapter::new(TEST_MODULE_ID, chain);
     let version: Version = version
         .unwrap_or_else(|| CONTRACT_VERSION.to_string())

diff --git a/contracts/account/manager/tests/upgrades.rs b/contracts/account/manager/tests/upgrades.rs
@@ -48,7 +48,7 @@ fn install_app_successful() -> AResult {
     let AbstractAccount { manager, proxy: _ } = &account;
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     // dependency for mock_adapter1 not met
@@ -87,7 +87,7 @@ fn install_app_versions_not_met() -> AResult {
     let AbstractAccount { manager, proxy: _ } = &account;
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     // install adapter 2
@@ -114,7 +114,7 @@ fn upgrade_app() -> AResult {
     let AbstractAccount { manager, proxy: _ } = &account;
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     // install adapter 1
@@ -284,7 +284,7 @@ fn uninstall_modules() -> AResult {
     let AbstractAccount { manager, proxy: _ } = &account;
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     let adapter1 = install_module_version(manager, &abstr, adapter_1::MOCK_ADAPTER_ID, V1)?;
@@ -319,7 +319,7 @@ fn update_adapter_with_authorized_addrs() -> AResult {
     let AbstractAccount { manager, proxy } = &account;
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     // install adapter 1
@@ -369,7 +369,7 @@ fn upgrade_manager_last() -> AResult {
 
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
     deploy_modules(&chain);
 
     // install adapter 1
@@ -431,7 +431,7 @@ fn no_duplicate_migrations() -> AResult {
 
     abstr
         .version_control
-        .claim_namespaces(TEST_ACCOUNT_ID, vec![TEST_NAMESPACE.to_string()])?;
+        .claim_namespace(TEST_ACCOUNT_ID, TEST_NAMESPACE.to_string())?;
     deploy_modules(&chain);
 
     // Install adapter 1