Fix unwrap_or_default attr values

ci/bootstrap-env/src/main.rs

@@ -183,7 +183,8 @@ fn main() -> Result<()> {
     );
 
     // Persist contract code_ids in local.yaml so we can use SKIP_CONTRACT_STORE locally to avoid having to re-store them again
-    cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+    cfg.contract_deploy_info
+        .clone_from(orc.contract_map.deploy_info());
     fs::write(
         "ci/configs/cosm-orc/local.yaml",
         serde_yaml::to_string(&cfg)?,

ci/integration-tests/src/helpers/chain.rs

@@ -99,7 +99,8 @@ fn global_setup() -> Cfg {
             .unwrap();
         save_gas_report(&orc, &gas_report_dir);
         // persist stored code_ids in CONFIG, so we can reuse for all tests
-        cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+        cfg.contract_deploy_info
+            .clone_from(orc.contract_map.deploy_info());
     }
 
     Cfg {

contracts/external/cw721-roles/src/contract.rs

@@ -319,14 +319,14 @@ pub fn execute_update_token_role(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Update role with new value
-    token.extension.role = role.clone();
+    token.extension.role.clone_from(&role);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::default()
         .add_attribute("action", "update_token_role")
         .add_attribute("sender", info.sender)
         .add_attribute("token_id", token_id)
-        .add_attribute("role", role.unwrap_or_default()))
+        .add_attribute("role", role.unwrap_or("None".to_string())))
 }
 
 pub fn execute_update_token_uri(
@@ -341,14 +341,14 @@ pub fn execute_update_token_uri(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Set new token URI
-    token.token_uri = token_uri.clone();
+    token.token_uri.clone_from(&token_uri);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::new()
         .add_attribute("action", "update_token_uri")
         .add_attribute("sender", info.sender)
         .add_attribute("token_id", token_id)
-        .add_attribute("token_uri", token_uri.unwrap_or_default()))
+        .add_attribute("token_uri", token_uri.unwrap_or("None".to_string())))
 }
 
 pub fn execute_update_token_weight(

contracts/external/cw721-roles/src/tests.rs

@@ -325,6 +325,20 @@ fn test_update_token_role() {
     // Token was updated successfully
     let info: NftInfoResponse<MetadataExt> = query_token_info(&app, &cw721_addr, "1").unwrap();
     assert_eq!(info.extension.role, Some("queen".to_string()));
+
+    // Can set to None
+    app.execute_contract(
+        Addr::unchecked(DAO),
+        cw721_addr.clone(),
+        &ExecuteMsg::Extension {
+            msg: ExecuteExt::UpdateTokenRole {
+                token_id: "1".to_string(),
+                role: None,
+            },
+        },
+        &[],
+    )
+    .unwrap();
 }
 
 #[test]

contracts/proposal/dao-proposal-condorcet/src/contract.rs

@@ -274,7 +274,10 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractE
 
             Ok(Response::default()
                 .add_attribute("proposal_execution_failed", proposal_id.to_string())
-                .add_attribute("error", msg.result.into_result().err().unwrap_or_default()))
+                .add_attribute(
+                    "error",
+                    msg.result.into_result().err().unwrap_or("None".to_string()),
+                ))
         }
         _ => unimplemented!("pre-propose and hooks not yet supported"),
     }

contracts/proposal/dao-proposal-multiple/src/contract.rs

@@ -997,7 +997,10 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractE
 
             Ok(Response::new()
                 .add_attribute("proposal execution failed", proposal_id.to_string())
-                .add_attribute("error", msg.result.into_result().err().unwrap_or_default()))
+                .add_attribute(
+                    "error",
+                    msg.result.into_result().err().unwrap_or("None".to_string()),
+                ))
         }
         TaggedReplyId::FailedProposalHook(idx) => {
             let addr = PROPOSAL_HOOKS.remove_hook_by_index(deps.storage, idx)?;

contracts/proposal/dao-proposal-single/src/contract.rs

@@ -1081,7 +1081,10 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractE
 
             Ok(Response::new()
                 .add_attribute("proposal_execution_failed", proposal_id.to_string())
-                .add_attribute("error", msg.result.into_result().err().unwrap_or_default()))
+                .add_attribute(
+                    "error",
+                    msg.result.into_result().err().unwrap_or("None".to_string()),
+                ))
         }
         TaggedReplyId::FailedProposalHook(idx) => {
             let addr = PROPOSAL_HOOKS.remove_hook_by_index(deps.storage, idx)?;

contracts/voting/dao-voting-token-staked/src/contract.rs

@@ -755,7 +755,10 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
                     // Construct the response
                     let mut res = Response::new()
                         .add_attribute("denom", info.denom)
-                        .add_attribute("token_contract", info.token_contract.unwrap_or_default());
+                        .add_attribute(
+                            "token_contract",
+                            info.token_contract.unwrap_or("None".to_string()),
+                        );
 
                     // If a callback has been configured, set the module
                     // instantiate callback data.