From 5334a9b07d0b9b8ee3494b707a49939cf60ec14e Mon Sep 17 00:00:00 2001 From: piobab Date: Tue, 10 Dec 2024 13:56:37 +0100 Subject: [PATCH] Fix for missing init for next order id. (#189) * Fix for missing init for next order id. * Update audit. --- .cargo/audit.toml | 2 +- contracts/credit-manager/src/migrations/v2_2_0.rs | 3 +++ contracts/credit-manager/tests/tests/test_migration_v2.rs | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.cargo/audit.toml b/.cargo/audit.toml index d971b765..4c505fae 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -4,4 +4,4 @@ # Ignore the following advisory IDs. # Reported vulnerabilities relate to test-tube which is only used for testing. # RUSTSEC-2024-0344 - no newer dependency fixing the issue in cosmwasm -ignore = ["RUSTSEC-2024-0003", "RUSTSEC-2024-0006", "RUSTSEC-2024-0019", "RUSTSEC-2024-0332", "RUSTSEC-2024-0336", "RUSTSEC-2024-0344"] \ No newline at end of file +ignore = ["RUSTSEC-2024-0003", "RUSTSEC-2024-0006", "RUSTSEC-2024-0019", "RUSTSEC-2024-0332", "RUSTSEC-2024-0336", "RUSTSEC-2024-0344", "RUSTSEC-2024-0421"] \ No newline at end of file diff --git a/contracts/credit-manager/src/migrations/v2_2_0.rs b/contracts/credit-manager/src/migrations/v2_2_0.rs index adef3abf..c93c5ff7 100644 --- a/contracts/credit-manager/src/migrations/v2_2_0.rs +++ b/contracts/credit-manager/src/migrations/v2_2_0.rs @@ -4,6 +4,7 @@ use cw2::{assert_contract_version, set_contract_version}; use crate::{ contract::{CONTRACT_NAME, CONTRACT_VERSION}, error::ContractError, + state::NEXT_TRIGGER_ID, }; const FROM_VERSION: &str = "2.1.0"; @@ -12,6 +13,8 @@ pub fn migrate(deps: DepsMut) -> Result { // make sure we're migrating the correct contract and from the correct version assert_contract_version(deps.storage, &format!("crates.io:{CONTRACT_NAME}"), FROM_VERSION)?; + NEXT_TRIGGER_ID.save(deps.storage, &1)?; + set_contract_version(deps.storage, format!("crates.io:{CONTRACT_NAME}"), CONTRACT_VERSION)?; Ok(Response::new() diff --git a/contracts/credit-manager/tests/tests/test_migration_v2.rs b/contracts/credit-manager/tests/tests/test_migration_v2.rs index 6bd371c2..46e9c45b 100644 --- a/contracts/credit-manager/tests/tests/test_migration_v2.rs +++ b/contracts/credit-manager/tests/tests/test_migration_v2.rs @@ -1,6 +1,6 @@ use cosmwasm_std::{attr, testing::mock_env, Empty, Event}; use cw2::{ContractVersion, VersionError}; -use mars_credit_manager::{contract::migrate, error::ContractError}; +use mars_credit_manager::{contract::migrate, error::ContractError, state::NEXT_TRIGGER_ID}; use mars_testing::mock_dependencies; #[test] @@ -44,6 +44,9 @@ fn successful_migration() { let res = migrate(deps.as_mut(), mock_env(), Empty {}).unwrap(); + let order_id = NEXT_TRIGGER_ID.load(deps.as_ref().storage).unwrap(); + assert_eq!(order_id, 1); + assert_eq!(res.messages, vec![]); assert_eq!(res.events, vec![] as Vec); assert!(res.data.is_none());