chore(access-manager): cleanup

Author: benluelo

Cargo.lock

@@ -24,7 +24,6 @@ frissitheto          = { workspace = true }
 serde                = { workspace = true, features = ["derive"] }
 serde-json-wasm      = "1.0.0"
 serde-utils          = { workspace = true }
-serde_json           = { workspace = true, features = ["raw_value"] }
 sha2                 = { workspace = true }
 strum                = { version = "0.27.2", features = ["derive"] }
 thiserror            = { workspace = true }

cosmwasm/access-managed/Cargo.toml

@@ -24,7 +24,6 @@ frissitheto          = { workspace = true }
 serde                = { workspace = true, features = ["derive"] }
 serde-json-wasm      = "1.0.0"
 serde-utils          = { workspace = true }
-serde_json           = { workspace = true, features = ["raw_value"] }
 sha2                 = { workspace = true }
 strum                = { version = "0.27.2", features = ["derive"] }
 thiserror            = { workspace = true }

cosmwasm/access-manager/Cargo.toml

@@ -497,13 +497,11 @@ pub(crate) fn schedule(
 ) -> Result<(H256, u32), ContractError> {
     let caller = ctx.msg_sender();
 
-    dbg!(data);
-
     // Fetch restrictions that apply to the caller on the targeted function
     let CanCall {
         allowed: _,
         delay: setback,
-    } = dbg!(_can_call_extended(ctx, caller, target, data)?);
+    } = _can_call_extended(ctx, caller, target, data)?;
 
     let min_when = ctx.timestamp() + u64::from(setback);
 
@@ -844,11 +842,9 @@ fn _get_admin_restrictions(
 
         // Restricted to that role's admin with no delay beside any execution delay the caller may
         // have.
-        Ok(GrantRole { role_id, .. } | RevokeRole { role_id, .. }) => Ok((
-            true,
-            dbg!(get_role_admin(ctx.query_ctx(), dbg!(role_id))?),
-            0,
-        )),
+        Ok(GrantRole { role_id, .. } | RevokeRole { role_id, .. }) => {
+            Ok((true, get_role_admin(ctx.query_ctx(), role_id)?, 0))
+        }
 
         _ => Ok((
             false,
@@ -896,7 +892,7 @@ fn _can_call_extended(
     data: &str,
 ) -> Result<CanCall, ContractError> {
     if target == ctx.address_this() {
-        dbg!(_can_call_self(ctx, caller, data))
+        _can_call_self(ctx, caller, data)
     } else {
         can_call(ctx.query_ctx(), caller, target, _check_selector(data)?)
     }
@@ -922,8 +918,6 @@ fn _can_call_self(ctx: &mut ExecCtx, caller: &Addr, data: &str) -> Result<CanCal
 
     let (admin_restricted, role_id, operation_delay) = _get_admin_restrictions(ctx, data)?;
 
-    dbg!((admin_restricted, role_id, operation_delay));
-
     // isTargetClosed apply to non-admin-restricted function
     if !admin_restricted && is_target_closed(ctx.query_ctx(), ctx.address_this())? {
         return Ok(CanCall {
@@ -935,7 +929,7 @@ fn _can_call_self(ctx: &mut ExecCtx, caller: &Addr, data: &str) -> Result<CanCal
     let HasRole {
         is_member,
         execution_delay,
-    } = dbg!(has_role(ctx.query_ctx(), role_id, caller)?);
+    } = has_role(ctx.query_ctx(), role_id, caller)?;
 
     if !is_member {
         return Ok(CanCall {

cosmwasm/access-manager/src/contract.rs

@@ -1474,16 +1474,14 @@ fn schedule_reentrant_works() {
     )
     .unwrap();
 
-    eprintln!("NOW\n\n\n");
-
     assert_eq!(
         execute(
             deps.as_mut(),
             env.clone(),
             message_info(&ACCOUNT_1, &[]),
             ExecuteMsg::Schedule {
                 target: env.contract.address.clone(),
-                data: serde_json::to_string(&ExecuteMsg::GrantRole {
+                data: serde_json_wasm::to_string(&ExecuteMsg::GrantRole {
                     role_id: RoleId::new(10),
                     account: ACCOUNT_2.clone(),
                     execution_delay: 0

cosmwasm/access-manager/src/tests.rs

@@ -320,13 +320,13 @@ async fn main() -> Result<()> {
     )
     .await?;
 
-    // schedule_increment(&alice_client, &bob_client, &manager, &managed).await?;
+    schedule_increment(&alice_client, &bob_client, &manager, &managed).await?;
 
-    // schedule_decrement_in_sub_msg(&alice_client, &bob_client, &manager, &managed).await?;
+    schedule_decrement_in_sub_msg(&alice_client, &bob_client, &manager, &managed).await?;
 
-    // schedule_increment_in_reply(&alice_client, &bob_client, &manager, &managed).await?;
+    schedule_increment_in_reply(&alice_client, &bob_client, &manager, &managed).await?;
 
-    // schedule_reentrant(&alice_client, &bob_client, &charlie_client, &manager).await?;
+    schedule_reentrant(&alice_client, &bob_client, &charlie_client, &manager).await?;
 
     execute_reentrant(
         &alice_client,