Skip to content

Commit fa77163

Browse files
webmaster128webmaster128
committed
Adapt tests to message_info
1 parent 529f871 commit fa77163

File tree

11 files changed

+221
-169
lines changed

11 files changed

+221
-169
lines changed

‎contracts/burner/src/contract.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fn cleanup(storage: &mut dyn Storage, mut limit: usize) -> usize {
8383
mod tests {
8484
use super::*;
8585
use cosmwasm_std::testing::{
86-
mock_dependencies, mock_dependencies_with_balance, mock_env, mock_info,
86+
message_info, mock_dependencies, mock_dependencies_with_balance, mock_env,
8787
};
8888
use cosmwasm_std::{coins, Attribute, StdError, Storage, SubMsg};
8989

@@ -102,8 +102,10 @@ mod tests {
102102
fn instantiate_fails() {
103103
let mut deps = mock_dependencies();
104104

105+
let creator = deps.api.addr_make("creator");
106+
105107
let msg = InstantiateMsg {};
106-
let info = mock_info("creator", &coins(1000, "earth"));
108+
let info = message_info(&creator, &coins(1000, "earth"));
107109
// we can just call .unwrap() to assert this was a success
108110
let res = instantiate(deps.as_mut(), mock_env(), info, msg);
109111
match res.unwrap_err() {
@@ -164,6 +166,8 @@ mod tests {
164166
fn execute_cleans_up_data() {
165167
let mut deps = mock_dependencies_with_balance(&coins(123456, "gold"));
166168

169+
let anon = deps.api.addr_make("anon");
170+
167171
// store some sample data
168172
deps.storage.set(b"foo", b"bar");
169173
deps.storage.set(b"key2", b"data2");
@@ -179,7 +183,7 @@ mod tests {
179183
let res = execute(
180184
deps.as_mut(),
181185
mock_env(),
182-
mock_info("anon", &[]),
186+
message_info(&anon, &[]),
183187
ExecuteMsg::Cleanup { limit: Some(2) },
184188
)
185189
.unwrap();
@@ -192,7 +196,7 @@ mod tests {
192196
let res = execute(
193197
deps.as_mut(),
194198
mock_env(),
195-
mock_info("anon", &[]),
199+
message_info(&anon, &[]),
196200
ExecuteMsg::Cleanup { limit: Some(2) },
197201
)
198202
.unwrap();

‎contracts/crypto-verify/src/contract.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ pub fn query_verify_bls12_pairing_g2(
324324
mod tests {
325325
use super::*;
326326
use cosmwasm_std::testing::{
327-
mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
327+
message_info, mock_dependencies, mock_env, MockApi, MockQuerier, MockStorage,
328328
};
329329
use cosmwasm_std::{from_json, OwnedDeps, RecoverPubkeyError, VerificationError};
330330
use hex_literal::hex;
@@ -354,8 +354,9 @@ mod tests {
354354

355355
fn setup() -> OwnedDeps<MockStorage, MockApi, MockQuerier> {
356356
let mut deps = mock_dependencies();
357+
let creator = deps.api.addr_make(CREATOR);
357358
let msg = InstantiateMsg {};
358-
let info = mock_info(CREATOR, &[]);
359+
let info = message_info(&creator, &[]);
359360
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
360361
assert_eq!(0, res.messages.len());
361362
deps

‎contracts/cyberpunk/src/contract.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,15 @@ fn query_denom(deps: Deps, denom: String) -> StdResult<DenomMetadata> {
227227
mod tests {
228228
use super::*;
229229
use cosmwasm_std::testing::{
230-
mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
230+
message_info, mock_dependencies, mock_env, MockApi, MockQuerier, MockStorage,
231231
};
232232
use cosmwasm_std::{from_json, DenomMetadata, DenomUnit, OwnedDeps};
233233

234234
fn setup() -> OwnedDeps<MockStorage, MockApi, MockQuerier> {
235235
let mut deps = mock_dependencies();
236+
let creator = deps.api.addr_make("creator");
236237
let msg = Empty {};
237-
let info = mock_info("creator", &[]);
238+
let info = message_info(&creator, &[]);
238239
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
239240
assert_eq!(0, res.messages.len());
240241
deps
@@ -248,9 +249,10 @@ mod tests {
248249
#[test]
249250
fn debug_works() {
250251
let mut deps = setup();
252+
let caller = deps.api.addr_make("caller");
251253

252254
let msg = ExecuteMsg::Debug {};
253-
execute(deps.as_mut(), mock_env(), mock_info("caller", &[]), msg).unwrap();
255+
execute(deps.as_mut(), mock_env(), message_info(&caller, &[]), msg).unwrap();
254256
}
255257

256258
#[test]

‎contracts/hackatom/src/contract.rs

Lines changed: 83 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ fn query_int() -> IntResponse {
294294
mod tests {
295295
use super::*;
296296
use cosmwasm_std::testing::{
297-
mock_dependencies, mock_dependencies_with_balances, mock_env, mock_info, MOCK_CONTRACT_ADDR,
297+
message_info, mock_dependencies, mock_dependencies_with_balances, mock_env,
298+
MOCK_CONTRACT_ADDR,
298299
};
299300
// import trait Storage to get access to read
300301
use cosmwasm_std::{coins, Binary, Storage, SubMsg};
@@ -303,20 +304,21 @@ mod tests {
303304
fn proper_initialization() {
304305
let mut deps = mock_dependencies();
305306

306-
let verifier: String = deps.api.addr_make("verifies").into();
307-
let beneficiary: String = deps.api.addr_make("benefits").into();
308-
let creator: String = deps.api.addr_make("creator").into();
307+
let verifier = deps.api.addr_make("verifies");
308+
let beneficiary = deps.api.addr_make("benefits");
309+
let creator = deps.api.addr_make("creator");
310+
309311
let expected_state = State {
310-
verifier: deps.api.addr_validate(&verifier).unwrap(),
311-
beneficiary: deps.api.addr_validate(&beneficiary).unwrap(),
312-
funder: deps.api.addr_validate(&creator).unwrap(),
312+
verifier: verifier.clone(),
313+
beneficiary: beneficiary.clone(),
314+
funder: creator.clone(),
313315
};
314316

315317
let msg = InstantiateMsg {
316-
verifier,
317-
beneficiary,
318+
verifier: verifier.to_string(),
319+
beneficiary: beneficiary.to_string(),
318320
};
319-
let info = mock_info(creator.as_str(), &[]);
321+
let info = message_info(&creator, &[]);
320322
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
321323
assert_eq!(res.messages.len(), 0);
322324
assert_eq!(res.attributes, [("Let the", "hacking begin")]);
@@ -331,34 +333,36 @@ mod tests {
331333
fn instantiate_and_query() {
332334
let mut deps = mock_dependencies();
333335

334-
let verifier: String = deps.api.addr_make("verifies").into();
335-
let beneficiary: String = deps.api.addr_make("benefits").into();
336-
let creator: String = deps.api.addr_make("creator").into();
336+
let verifier = deps.api.addr_make("verifies");
337+
let beneficiary = deps.api.addr_make("benefits");
338+
let creator = deps.api.addr_make("creator");
339+
337340
let msg = InstantiateMsg {
338-
verifier: verifier.clone(),
339-
beneficiary,
341+
verifier: verifier.to_string(),
342+
beneficiary: beneficiary.to_string(),
340343
};
341-
let info = mock_info(&creator, &[]);
344+
let info = message_info(&creator, &[]);
342345
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
343346
assert_eq!(0, res.messages.len());
344347

345348
// now let's query
346349
let query_response = query_verifier(deps.as_ref()).unwrap();
347-
assert_eq!(query_response.verifier, verifier);
350+
assert_eq!(query_response.verifier, verifier.as_str());
348351
}
349352

350353
#[test]
351354
fn migrate_verifier() {
352355
let mut deps = mock_dependencies();
353356

354-
let verifier: String = deps.api.addr_make("verifies").into();
355-
let beneficiary: String = deps.api.addr_make("benefits").into();
356-
let creator: String = deps.api.addr_make("creator").into();
357+
let verifier = deps.api.addr_make("verifies");
358+
let beneficiary = deps.api.addr_make("benefits");
359+
let creator = deps.api.addr_make("creator");
360+
357361
let msg = InstantiateMsg {
358-
verifier: verifier.clone(),
359-
beneficiary,
362+
verifier: verifier.to_string(),
363+
beneficiary: beneficiary.to_string(),
360364
};
361-
let info = mock_info(&creator, &[]);
365+
let info = message_info(&creator, &[]);
362366
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
363367
assert_eq!(0, res.messages.len());
364368

@@ -386,28 +390,35 @@ mod tests {
386390
fn sudo_can_steal_tokens() {
387391
let mut deps = mock_dependencies();
388392

389-
let verifier: String = deps.api.addr_make("verifies").into();
390-
let beneficiary: String = deps.api.addr_make("benefits").into();
391-
let creator: String = deps.api.addr_make("creator").into();
393+
let verifier = deps.api.addr_make("verifies");
394+
let beneficiary = deps.api.addr_make("benefits");
395+
let creator = deps.api.addr_make("creator");
396+
392397
let msg = InstantiateMsg {
393-
verifier,
394-
beneficiary,
398+
verifier: verifier.to_string(),
399+
beneficiary: beneficiary.to_string(),
395400
};
396-
let info = mock_info(&creator, &[]);
401+
let info = message_info(&creator, &[]);
397402
let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
398403
assert_eq!(0, res.messages.len());
399404

400405
// sudo takes any tax it wants
401-
let to_address = String::from("community-pool");
406+
let to_address = deps.api.addr_make("community-pool");
402407
let amount = coins(700, "gold");
403408
let sys_msg = SudoMsg::StealFunds {
404-
recipient: to_address.clone(),
409+
recipient: to_address.to_string(),
405410
amount: amount.clone(),
406411
};
407412
let res = sudo(deps.as_mut(), mock_env(), sys_msg).unwrap();
408413
assert_eq!(1, res.messages.len());
409414
let msg = res.messages.first().expect("no message");
410-
assert_eq!(msg, &SubMsg::new(BankMsg::Send { to_address, amount }));
415+
assert_eq!(
416+
msg,
417+
&SubMsg::new(BankMsg::Send {
418+
to_address: to_address.to_string(),
419+
amount
420+
})
421+
);
411422
}
412423

413424
#[test]
@@ -430,17 +441,17 @@ mod tests {
430441
let mut deps = mock_dependencies();
431442

432443
// initialize the store
433-
let creator: String = deps.api.addr_make("creator").into();
434-
let verifier: String = deps.api.addr_make("verifies").into();
435-
let beneficiary: String = deps.api.addr_make("benefits").into();
444+
let creator = deps.api.addr_make("creator");
445+
let verifier = deps.api.addr_make("verifies");
446+
let beneficiary = deps.api.addr_make("benefits");
436447

437448
let instantiate_msg = InstantiateMsg {
438-
verifier: verifier.clone(),
439-
beneficiary: beneficiary.clone(),
449+
verifier: verifier.to_string(),
450+
beneficiary: beneficiary.to_string(),
440451
};
441452
let init_amount = coins(1000, "earth");
442-
let init_info = mock_info(&creator, &init_amount);
443-
let init_res = instantiate(deps.as_mut(), mock_env(), init_info, instantiate_msg).unwrap();
453+
let info = message_info(&creator, &init_amount);
454+
let init_res = instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
444455
assert_eq!(init_res.messages.len(), 0);
445456

446457
// balance changed in init
@@ -449,7 +460,7 @@ mod tests {
449460
.update_balance(MOCK_CONTRACT_ADDR, init_amount);
450461

451462
// beneficiary can release it
452-
let execute_info = mock_info(verifier.as_str(), &[]);
463+
let execute_info = message_info(&verifier, &[]);
453464
let execute_res = execute(
454465
deps.as_mut(),
455466
mock_env(),
@@ -462,13 +473,13 @@ mod tests {
462473
assert_eq!(
463474
msg,
464475
&SubMsg::new(BankMsg::Send {
465-
to_address: beneficiary.clone(),
476+
to_address: beneficiary.to_string(),
466477
amount: coins(1000, "earth"),
467478
}),
468479
);
469480
assert_eq!(
470481
execute_res.attributes,
471-
vec![("action", "release"), ("destination", &beneficiary)],
482+
vec![("action", "release"), ("destination", beneficiary.as_str())],
472483
);
473484
assert_eq!(execute_res.data, Some(vec![0xF0, 0x0B, 0xAA].into()));
474485
}
@@ -478,17 +489,17 @@ mod tests {
478489
let mut deps = mock_dependencies();
479490

480491
// initialize the store
481-
let creator: String = deps.api.addr_make("creator").into();
482-
let verifier: String = deps.api.addr_make("verifies").into();
483-
let beneficiary: String = deps.api.addr_make("benefits").into();
492+
let creator = deps.api.addr_make("creator");
493+
let verifier = deps.api.addr_make("verifies");
494+
let beneficiary = deps.api.addr_make("benefits");
484495

485496
let instantiate_msg = InstantiateMsg {
486-
verifier: verifier.clone(),
487-
beneficiary: beneficiary.clone(),
497+
verifier: verifier.to_string(),
498+
beneficiary: beneficiary.to_string(),
488499
};
489500
let init_amount = coins(1000, "earth");
490-
let init_info = mock_info(&creator, &init_amount);
491-
let init_res = instantiate(deps.as_mut(), mock_env(), init_info, instantiate_msg).unwrap();
501+
let info = message_info(&creator, &init_amount);
502+
let init_res = instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
492503
assert_eq!(init_res.messages.len(), 0);
493504

494505
// balance changed in init
@@ -497,7 +508,7 @@ mod tests {
497508
.update_balance(MOCK_CONTRACT_ADDR, init_amount);
498509

499510
// beneficiary cannot release it
500-
let execute_info = mock_info(beneficiary.as_str(), &[]);
511+
let execute_info = message_info(&beneficiary, &[]);
501512
let execute_res = execute(
502513
deps.as_mut(),
503514
mock_env(),
@@ -512,9 +523,9 @@ mod tests {
512523
assert_eq!(
513524
state,
514525
State {
515-
verifier: Addr::unchecked(verifier),
516-
beneficiary: Addr::unchecked(beneficiary),
517-
funder: Addr::unchecked(creator),
526+
verifier: verifier.clone(),
527+
beneficiary: beneficiary.clone(),
528+
funder: creator.clone(),
518529
}
519530
);
520531
}
@@ -525,19 +536,19 @@ mod tests {
525536
let mut deps = mock_dependencies();
526537

527538
// initialize the store
528-
let verifier: String = deps.api.addr_make("verifies").into();
529-
let beneficiary: String = deps.api.addr_make("benefits").into();
530-
let creator: String = deps.api.addr_make("creator").into();
539+
let verifier = deps.api.addr_make("verifies");
540+
let beneficiary = deps.api.addr_make("benefits");
541+
let creator = deps.api.addr_make("creator");
531542

532543
let instantiate_msg = InstantiateMsg {
533-
verifier,
534-
beneficiary: beneficiary.clone(),
544+
verifier: verifier.to_string(),
545+
beneficiary: beneficiary.to_string(),
535546
};
536-
let init_info = mock_info(&creator, &coins(1000, "earth"));
537-
let init_res = instantiate(deps.as_mut(), mock_env(), init_info, instantiate_msg).unwrap();
547+
let info = message_info(&creator, &coins(1000, "earth"));
548+
let init_res = instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
538549
assert_eq!(0, init_res.messages.len());
539550

540-
let execute_info = mock_info(&beneficiary, &[]);
551+
let execute_info = message_info(&beneficiary, &[]);
541552
// this should panic
542553
let _ = execute(
543554
deps.as_mut(),
@@ -551,15 +562,20 @@ mod tests {
551562
fn execute_user_errors_in_api_calls() {
552563
let mut deps = mock_dependencies();
553564

565+
let creator = deps.api.addr_make("creator");
566+
let anyone = deps.api.addr_make("anyone");
567+
let verifier = deps.api.addr_make("verifies");
568+
let beneficiary = deps.api.addr_make("benefits");
569+
554570
let instantiate_msg = InstantiateMsg {
555-
verifier: deps.api.addr_make("verifies").into(),
556-
beneficiary: deps.api.addr_make("benefits").into(),
571+
verifier: verifier.to_string(),
572+
beneficiary: beneficiary.to_string(),
557573
};
558-
let init_info = mock_info("creator", &coins(1000, "earth"));
559-
let init_res = instantiate(deps.as_mut(), mock_env(), init_info, instantiate_msg).unwrap();
560-
assert_eq!(0, init_res.messages.len());
574+
let info = message_info(&creator, &coins(1000, "earth"));
575+
let response = instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
576+
assert_eq!(0, response.messages.len());
561577

562-
let execute_info = mock_info("anyone", &[]);
578+
let execute_info = message_info(&anyone, &[]);
563579
execute(
564580
deps.as_mut(),
565581
mock_env(),

0 commit comments

Comments
 (0)