Skip to content

Commit b17169a

Browse files
DariuszDeptachipshort
DariuszDepta
authored and
chipshort
committed
Updates.
1 parent 8066204 commit b17169a

File tree

2 files changed

+47
-43
lines changed

2 files changed

+47
-43
lines changed

‎contracts/hackatom/src/contract.rs

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ mod tests {
316316
fn proper_initialization() {
317317
let mut deps = mock_dependencies();
318318

319-
let verifier = String::from("verifies");
320-
let beneficiary = String::from("benefits");
321-
let creator = String::from("creator");
319+
let verifier: String = deps.api.addr_make("verifies").into();
320+
let beneficiary: String = deps.api.addr_make("benefits").into();
321+
let creator: String = deps.api.addr_make("creator").into();
322322
let expected_state = State {
323323
verifier: deps.api.addr_validate(&verifier).unwrap(),
324324
beneficiary: deps.api.addr_validate(&beneficiary).unwrap(),
@@ -344,9 +344,9 @@ mod tests {
344344
fn instantiate_and_query() {
345345
let mut deps = mock_dependencies();
346346

347-
let verifier = String::from("verifies");
348-
let beneficiary = String::from("benefits");
349-
let creator = String::from("creator");
347+
let verifier: String = deps.api.addr_make("verifies").into();
348+
let beneficiary: String = deps.api.addr_make("benefits").into();
349+
let creator: String = deps.api.addr_make("creator").into();
350350
let msg = InstantiateMsg {
351351
verifier: verifier.clone(),
352352
beneficiary,
@@ -364,11 +364,11 @@ mod tests {
364364
fn migrate_verifier() {
365365
let mut deps = mock_dependencies();
366366

367-
let verifier = String::from("verifies");
368-
let beneficiary = String::from("benefits");
369-
let creator = String::from("creator");
367+
let verifier: String = deps.api.addr_make("verifies").into();
368+
let beneficiary: String = deps.api.addr_make("benefits").into();
369+
let creator: String = deps.api.addr_make("creator").into();
370370
let msg = InstantiateMsg {
371-
verifier,
371+
verifier: verifier.clone(),
372372
beneficiary,
373373
};
374374
let info = mock_info(&creator, &[]);
@@ -377,10 +377,13 @@ mod tests {
377377

378378
// check it is 'verifies'
379379
let query_response = query(deps.as_ref(), mock_env(), QueryMsg::Verifier {}).unwrap();
380-
assert_eq!(query_response.as_slice(), b"{\"verifier\":\"verifies\"}");
380+
assert_eq!(
381+
query_response.as_slice(),
382+
format!(r#"{{"verifier":"{verifier}"}}"#).as_bytes()
383+
);
381384

382385
// change the verifier via migrate
383-
let new_verifier = String::from("someone else");
386+
let new_verifier: String = deps.api.addr_make("someone else").into();
384387
let msg = MigrateMsg {
385388
verifier: new_verifier.clone(),
386389
};
@@ -396,9 +399,9 @@ mod tests {
396399
fn sudo_can_steal_tokens() {
397400
let mut deps = mock_dependencies();
398401

399-
let verifier = String::from("verifies");
400-
let beneficiary = String::from("benefits");
401-
let creator = String::from("creator");
402+
let verifier: String = deps.api.addr_make("verifies").into();
403+
let beneficiary: String = deps.api.addr_make("benefits").into();
404+
let creator: String = deps.api.addr_make("creator").into();
402405
let msg = InstantiateMsg {
403406
verifier,
404407
beneficiary,
@@ -440,9 +443,9 @@ mod tests {
440443
let mut deps = mock_dependencies();
441444

442445
// initialize the store
443-
let creator = String::from("creator");
444-
let verifier = String::from("verifies");
445-
let beneficiary = String::from("benefits");
446+
let creator: String = deps.api.addr_make("creator").into();
447+
let verifier: String = deps.api.addr_make("verifies").into();
448+
let beneficiary: String = deps.api.addr_make("benefits").into();
446449

447450
let instantiate_msg = InstantiateMsg {
448451
verifier: verifier.clone(),
@@ -470,13 +473,13 @@ mod tests {
470473
assert_eq!(
471474
msg,
472475
&SubMsg::new(BankMsg::Send {
473-
to_address: beneficiary,
476+
to_address: beneficiary.clone(),
474477
amount: coins(1000, "earth"),
475478
}),
476479
);
477480
assert_eq!(
478481
execute_res.attributes,
479-
vec![("action", "release"), ("destination", "benefits")],
482+
vec![("action", "release"), ("destination", &beneficiary)],
480483
);
481484
assert_eq!(execute_res.data, Some(vec![0xF0, 0x0B, 0xAA].into()));
482485
}
@@ -486,9 +489,9 @@ mod tests {
486489
let mut deps = mock_dependencies();
487490

488491
// initialize the store
489-
let creator = String::from("creator");
490-
let verifier = String::from("verifies");
491-
let beneficiary = String::from("benefits");
492+
let creator: String = deps.api.addr_make("creator").into();
493+
let verifier: String = deps.api.addr_make("verifies").into();
494+
let beneficiary: String = deps.api.addr_make("benefits").into();
492495

493496
let instantiate_msg = InstantiateMsg {
494497
verifier: verifier.clone(),
@@ -531,9 +534,9 @@ mod tests {
531534
let mut deps = mock_dependencies();
532535

533536
// initialize the store
534-
let verifier = String::from("verifies");
535-
let beneficiary = String::from("benefits");
536-
let creator = String::from("creator");
537+
let verifier: String = deps.api.addr_make("verifies").into();
538+
let beneficiary: String = deps.api.addr_make("benefits").into();
539+
let creator: String = deps.api.addr_make("creator").into();
537540

538541
let instantiate_msg = InstantiateMsg {
539542
verifier,
@@ -558,8 +561,8 @@ mod tests {
558561
let mut deps = mock_dependencies();
559562

560563
let instantiate_msg = InstantiateMsg {
561-
verifier: String::from("verifies"),
562-
beneficiary: String::from("benefits"),
564+
verifier: deps.api.addr_make("verifies").into(),
565+
beneficiary: deps.api.addr_make("benefits").into(),
563566
};
564567
let init_info = mock_info("creator", &coins(1000, "earth"));
565568
let init_res = instantiate(deps.as_mut(), mock_env(), init_info, instantiate_msg).unwrap();
@@ -584,7 +587,7 @@ mod tests {
584587
let contract = Addr::unchecked("my-contract");
585588
let bin_contract: &[u8] = b"my-contract";
586589

587-
// return the unhashed value here
590+
// return the un-hashed value here
588591
let no_work_query = query_recurse(deps.as_ref(), 0, 0, contract.clone()).unwrap();
589592
assert_eq!(no_work_query.hashed, Binary::from(bin_contract));
590593

‎packages/std/src/testing/mock.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use alloc::collections::BTreeMap;
22
use bech32::{decode, encode, FromBase32, ToBase32, Variant};
3-
use core::iter::IntoIterator;
43
use core::marker::PhantomData;
54
#[cfg(feature = "cosmwasm_1_3")]
65
use core::ops::Bound;
@@ -1151,7 +1150,7 @@ mod tests {
11511150
// valid
11521151
let humanized = "cosmwasm1h34lmpywh4upnjdg90cjf4j70aee6z8qqfspugamjp42e4q28kqs8s7vcp";
11531152
let addr = api.addr_validate(humanized).unwrap();
1154-
assert_eq!(addr, humanized);
1153+
assert_eq!(addr.as_str(), humanized);
11551154

11561155
// invalid: too short
11571156
api.addr_validate("").unwrap_err();
@@ -1194,7 +1193,7 @@ mod tests {
11941193
let canonical = api.addr_canonicalize(&original).unwrap();
11951194
let recovered = api.addr_humanize(&canonical).unwrap();
11961195
assert_eq!(
1197-
recovered,
1196+
recovered.as_str(),
11981197
"cosmwasm1h34lmpywh4upnjdg90cjf4j70aee6z8qqfspugamjp42e4q28kqs8s7vcp"
11991198
);
12001199

@@ -2123,20 +2122,19 @@ mod tests {
21232122
}
21242123

21252124
querier.update_handler(|request| {
2126-
let constract1 = Addr::unchecked("contract1");
2125+
let api = MockApi::default();
2126+
let contract1 = api.addr_make("contract1");
21272127
let mut storage1 = HashMap::<Binary, Binary>::default();
21282128
storage1.insert(b"the key".into(), b"the value".into());
21292129

2130-
let api = MockApi::default();
2131-
21322130
match request {
21332131
WasmQuery::Raw { contract_addr, key } => {
21342132
let Ok(addr) = api.addr_validate(contract_addr) else {
21352133
return SystemResult::Err(SystemError::NoSuchContract {
21362134
addr: contract_addr.clone(),
21372135
});
21382136
};
2139-
if addr == constract1 {
2137+
if addr == contract1 {
21402138
if let Some(value) = storage1.get(key) {
21412139
SystemResult::Ok(ContractResult::Ok(value.clone()))
21422140
} else {
@@ -2154,7 +2152,7 @@ mod tests {
21542152
addr: contract_addr.clone(),
21552153
});
21562154
};
2157-
if addr == constract1 {
2155+
if addr == contract1 {
21582156
#[derive(Deserialize)]
21592157
struct MyMsg {}
21602158
let _msg: MyMsg = match from_json(msg) {
@@ -2177,7 +2175,7 @@ mod tests {
21772175
addr: contract_addr.clone(),
21782176
});
21792177
};
2180-
if addr == constract1 {
2178+
if addr == contract1 {
21812179
let response = ContractInfoResponse {
21822180
code_id: 4,
21832181
creator: Addr::unchecked("lalala"),
@@ -2213,17 +2211,20 @@ mod tests {
22132211
}
22142212
});
22152213

2214+
let contract_addr = MockApi::default().addr_make("contract1");
2215+
22162216
// WasmQuery::Raw
22172217
let result = querier.query(&WasmQuery::Raw {
2218-
contract_addr: "contract1".into(),
2218+
contract_addr: contract_addr.clone().into(),
22192219
key: b"the key".into(),
22202220
});
2221+
22212222
match result {
22222223
SystemResult::Ok(ContractResult::Ok(value)) => assert_eq!(value, b"the value" as &[u8]),
22232224
res => panic!("Unexpected result: {res:?}"),
22242225
}
22252226
let result = querier.query(&WasmQuery::Raw {
2226-
contract_addr: "contract1".into(),
2227+
contract_addr: contract_addr.clone().into(),
22272228
key: b"other key".into(),
22282229
});
22292230
match result {
@@ -2233,7 +2234,7 @@ mod tests {
22332234

22342235
// WasmQuery::Smart
22352236
let result = querier.query(&WasmQuery::Smart {
2236-
contract_addr: "contract1".into(),
2237+
contract_addr: contract_addr.clone().into(),
22372238
msg: b"{}".into(),
22382239
});
22392240
match result {
@@ -2244,7 +2245,7 @@ mod tests {
22442245
res => panic!("Unexpected result: {res:?}"),
22452246
}
22462247
let result = querier.query(&WasmQuery::Smart {
2247-
contract_addr: "contract1".into(),
2248+
contract_addr: contract_addr.clone().into(),
22482249
msg: b"a broken request".into(),
22492250
});
22502251
match result {
@@ -2256,7 +2257,7 @@ mod tests {
22562257

22572258
// WasmQuery::ContractInfo
22582259
let result = querier.query(&WasmQuery::ContractInfo {
2259-
contract_addr: "contract1".into(),
2260+
contract_addr: contract_addr.into(),
22602261
});
22612262
match result {
22622263
SystemResult::Ok(ContractResult::Ok(value)) => assert_eq!(

0 commit comments

Comments
 (0)