Skip to content

Commit a8b9828

Browse files
deniszagumennovdeniszagumennov
committed
Fixed rewards manager, splitter, strategy, token tests
1 parent 29f9149 commit a8b9828

File tree

5 files changed

+216
-160
lines changed

5 files changed

+216
-160
lines changed

‎contracts/rewards-manager/src/tests.rs‎

Lines changed: 67 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ fn instantiate_contract(
2121
contract: fn() -> Box<dyn Contract<Empty>>,
2222
label: String,
2323
) -> Addr {
24+
let deps = mock_dependencies();
2425
let contract_id = app.store_code(contract());
2526
app.instantiate_contract(
2627
contract_id,
27-
Addr::unchecked(OWNER_ADDR),
28+
deps.api.addr_make(OWNER_ADDR),
2829
&Empty {},
2930
&[],
3031
label,
@@ -89,12 +90,12 @@ fn instantiate_rewards_manager_contract(app: &mut App, id: u64, msg: Instantiate
8990
.unwrap()
9091
}
9192

92-
fn mock_app() -> App {
93+
fn mock_app(sender_addr: Addr) -> App {
9394
custom_app(|r, _a, s| {
9495
r.bank
9596
.init_balance(
9697
s,
97-
&Addr::unchecked(SENDER_ADDR),
98+
&sender_addr,
9899
vec![
99100
Coin {
100101
denom: "untrn".to_string(),
@@ -114,10 +115,10 @@ fn mock_app() -> App {
114115
fn test_initialization() {
115116
let mut deps = mock_dependencies();
116117
let msg = InstantiateMsg {
117-
owner: OWNER_ADDR.to_string(),
118+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
118119
};
119120

120-
let info = message_info(&Addr::unchecked(OWNER_ADDR), &[]);
121+
let info = message_info(&deps.api.addr_make(OWNER_ADDR), &[]);
121122
let res = instantiate(deps.as_mut(), mock_env(), info.clone(), msg.clone()).unwrap();
122123

123124
assert_eq!(
@@ -126,23 +127,26 @@ fn test_initialization() {
126127
Event::new("crates.io:drop-staking__drop-rewards-manager-instantiate".to_string())
127128
.add_attributes(vec![Attribute::new(
128129
"owner".to_string(),
129-
OWNER_ADDR.to_string()
130+
deps.api.addr_make(OWNER_ADDR).to_string()
130131
),])
131132
]
132133
);
133134
}
134135

135136
#[test]
136137
fn test_handlers_query() {
137-
let mut app = mock_app();
138+
let deps = mock_dependencies();
139+
let sender_address = deps.api.addr_make(SENDER_ADDR);
140+
141+
let mut app = mock_app(sender_address);
138142

139143
let rewards_manager_code_id = app.store_code(rewards_manager_contract());
140144

141145
let rewards_manager_contract = instantiate_rewards_manager_contract(
142146
&mut app,
143147
rewards_manager_code_id,
144148
InstantiateMsg {
145-
owner: OWNER_ADDR.to_string(),
149+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
146150
},
147151
);
148152

@@ -156,15 +160,18 @@ fn test_handlers_query() {
156160

157161
#[test]
158162
fn test_pause_query() {
159-
let mut app = mock_app();
163+
let deps = mock_dependencies();
164+
let sender_address = deps.api.addr_make(SENDER_ADDR);
165+
166+
let mut app = mock_app(sender_address);
160167

161168
let rewards_manager_code_id = app.store_code(rewards_manager_contract());
162169

163170
let rewards_manager_contract = instantiate_rewards_manager_contract(
164171
&mut app,
165172
rewards_manager_code_id,
166173
InstantiateMsg {
167-
owner: OWNER_ADDR.to_string(),
174+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
168175
},
169176
);
170177

@@ -178,21 +185,24 @@ fn test_pause_query() {
178185

179186
#[test]
180187
fn test_pause_handler_not_owner_error() {
181-
let mut app = mock_app();
188+
let deps = mock_dependencies();
189+
let sender_address = deps.api.addr_make(SENDER_ADDR);
190+
191+
let mut app = mock_app(sender_address);
182192

183193
let rewards_manager_code_id = app.store_code(rewards_manager_contract());
184194

185195
let rewards_manager_contract = instantiate_rewards_manager_contract(
186196
&mut app,
187197
rewards_manager_code_id,
188198
InstantiateMsg {
189-
owner: OWNER_ADDR.to_string(),
199+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
190200
},
191201
);
192202

193203
let error = app
194204
.execute_contract(
195-
Addr::unchecked("WrongOwner"),
205+
deps.api.addr_make("WrongOwner"),
196206
rewards_manager_contract.clone(),
197207
&ExecuteMsg::Pause {},
198208
&[],
@@ -209,21 +219,24 @@ fn test_pause_handler_not_owner_error() {
209219

210220
#[test]
211221
fn test_pause_handler() {
212-
let mut app = mock_app();
222+
let deps = mock_dependencies();
223+
let sender_address = deps.api.addr_make(SENDER_ADDR);
224+
225+
let mut app = mock_app(sender_address);
213226

214227
let rewards_manager_code_id = app.store_code(rewards_manager_contract());
215228

216229
let rewards_manager_contract = instantiate_rewards_manager_contract(
217230
&mut app,
218231
rewards_manager_code_id,
219232
InstantiateMsg {
220-
owner: OWNER_ADDR.to_string(),
233+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
221234
},
222235
);
223236

224237
let res = app
225238
.execute_contract(
226-
Addr::unchecked(OWNER_ADDR),
239+
deps.api.addr_make(OWNER_ADDR),
227240
rewards_manager_contract.clone(),
228241
&ExecuteMsg::Pause {},
229242
&[],
@@ -246,7 +259,7 @@ fn test_pause_handler() {
246259

247260
let _res = app
248261
.execute_contract(
249-
Addr::unchecked(OWNER_ADDR),
262+
deps.api.addr_make(OWNER_ADDR),
250263
rewards_manager_contract.clone(),
251264
&ExecuteMsg::Unpause {},
252265
&[],
@@ -263,21 +276,24 @@ fn test_pause_handler() {
263276

264277
#[test]
265278
fn test_paused_error() {
266-
let mut app = mock_app();
279+
let deps = mock_dependencies();
280+
let sender_address = deps.api.addr_make(SENDER_ADDR);
281+
282+
let mut app = mock_app(sender_address);
267283

268284
let rewards_manager_code_id = app.store_code(rewards_manager_contract());
269285

270286
let rewards_manager_contract = instantiate_rewards_manager_contract(
271287
&mut app,
272288
rewards_manager_code_id,
273289
InstantiateMsg {
274-
owner: OWNER_ADDR.to_string(),
290+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
275291
},
276292
);
277293

278294
let _res = app
279295
.execute_contract(
280-
Addr::unchecked(OWNER_ADDR),
296+
deps.api.addr_make(OWNER_ADDR),
281297
rewards_manager_contract.clone(),
282298
&ExecuteMsg::Pause {},
283299
&[],
@@ -293,7 +309,7 @@ fn test_paused_error() {
293309

294310
let unwrapped_err = app
295311
.execute_contract(
296-
Addr::unchecked(OWNER_ADDR),
312+
deps.api.addr_make(OWNER_ADDR),
297313
rewards_manager_contract.clone(),
298314
&ExecuteMsg::ExchangeRewards {
299315
denoms: vec!["ueth".to_string()],
@@ -308,7 +324,10 @@ fn test_paused_error() {
308324

309325
#[test]
310326
fn test_add_remove_handler() {
311-
let mut app = mock_app();
327+
let deps = mock_dependencies();
328+
let sender_address = deps.api.addr_make(SENDER_ADDR);
329+
330+
let mut app = mock_app(sender_address);
312331

313332
let handler_contract = instantiate_handler_contract(&mut app);
314333

@@ -318,7 +337,7 @@ fn test_add_remove_handler() {
318337
&mut app,
319338
rewards_manager_code_id,
320339
InstantiateMsg {
321-
owner: OWNER_ADDR.to_string(),
340+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
322341
},
323342
);
324343

@@ -330,7 +349,7 @@ fn test_add_remove_handler() {
330349

331350
let res = app
332351
.execute_contract(
333-
Addr::unchecked(OWNER_ADDR),
352+
deps.api.addr_make(OWNER_ADDR),
334353
rewards_manager_contract.clone(),
335354
&ExecuteMsg::AddHandler {
336355
config: handler_config.clone(),
@@ -375,7 +394,7 @@ fn test_add_remove_handler() {
375394
);
376395

377396
let res = app.execute_contract(
378-
Addr::unchecked(OWNER_ADDR),
397+
deps.api.addr_make(OWNER_ADDR),
379398
rewards_manager_contract.clone(),
380399
&ExecuteMsg::AddHandler {
381400
config: handler_config.clone(),
@@ -390,7 +409,7 @@ fn test_add_remove_handler() {
390409

391410
let res = app
392411
.execute_contract(
393-
Addr::unchecked(OWNER_ADDR),
412+
deps.api.addr_make(OWNER_ADDR),
394413
rewards_manager_contract.clone(),
395414
&ExecuteMsg::RemoveHandler {
396415
denom: handler_config.denom.clone(),
@@ -426,9 +445,10 @@ fn test_add_remove_handler() {
426445

427446
#[test]
428447
fn test_handler_call() {
429-
let mut app = mock_app();
448+
let deps = mock_dependencies();
449+
let sender_address = deps.api.addr_make(SENDER_ADDR);
430450

431-
let sender_address = Addr::unchecked(SENDER_ADDR);
451+
let mut app = mock_app(sender_address.clone());
432452

433453
let handler_contract = instantiate_handler_contract(&mut app);
434454

@@ -438,13 +458,13 @@ fn test_handler_call() {
438458
&mut app,
439459
rewards_manager_code_id,
440460
InstantiateMsg {
441-
owner: OWNER_ADDR.to_string(),
461+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
442462
},
443463
);
444464

445465
let amount = coins(100, "ueth");
446466
let _ = app
447-
.send_tokens(sender_address, rewards_manager_contract.clone(), &amount)
467+
.send_tokens(sender_address.clone(), rewards_manager_contract.clone(), &amount)
448468
.unwrap();
449469

450470
let handler_config = HandlerConfig {
@@ -455,7 +475,7 @@ fn test_handler_call() {
455475

456476
let _res = app
457477
.execute_contract(
458-
Addr::unchecked(OWNER_ADDR),
478+
deps.api.addr_make(OWNER_ADDR),
459479
rewards_manager_contract.clone(),
460480
&ExecuteMsg::AddHandler {
461481
config: handler_config.clone(),
@@ -466,7 +486,7 @@ fn test_handler_call() {
466486

467487
let res = app
468488
.execute_contract(
469-
Addr::unchecked(OWNER_ADDR),
489+
deps.api.addr_make(OWNER_ADDR),
470490
rewards_manager_contract.clone(),
471491
&ExecuteMsg::ExchangeRewards {
472492
denoms: vec!["ueth".to_string()],
@@ -492,9 +512,10 @@ fn test_handler_call() {
492512

493513
#[test]
494514
fn test_empty_denoms_list() {
495-
let mut app = mock_app();
515+
let deps = mock_dependencies();
516+
let sender_address = deps.api.addr_make(SENDER_ADDR);
496517

497-
let sender_address = Addr::unchecked(SENDER_ADDR);
518+
let mut app = mock_app(sender_address.clone());
498519

499520
let handler_contract = instantiate_handler_contract(&mut app);
500521

@@ -504,13 +525,13 @@ fn test_empty_denoms_list() {
504525
&mut app,
505526
rewards_manager_code_id,
506527
InstantiateMsg {
507-
owner: OWNER_ADDR.to_string(),
528+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
508529
},
509530
);
510531

511532
let amount = coins(100, "ueth");
512533
let _ = app
513-
.send_tokens(sender_address, rewards_manager_contract.clone(), &amount)
534+
.send_tokens(sender_address.clone(), rewards_manager_contract.clone(), &amount)
514535
.unwrap();
515536

516537
let handler_config = HandlerConfig {
@@ -521,7 +542,7 @@ fn test_empty_denoms_list() {
521542

522543
let _res = app
523544
.execute_contract(
524-
Addr::unchecked(OWNER_ADDR),
545+
deps.api.addr_make(OWNER_ADDR),
525546
rewards_manager_contract.clone(),
526547
&ExecuteMsg::AddHandler {
527548
config: handler_config.clone(),
@@ -531,7 +552,7 @@ fn test_empty_denoms_list() {
531552
.unwrap();
532553

533554
let res = app.execute_contract(
534-
Addr::unchecked(OWNER_ADDR),
555+
deps.api.addr_make(OWNER_ADDR),
535556
rewards_manager_contract.clone(),
536557
&ExecuteMsg::ExchangeRewards { denoms: vec![] },
537558
&[],
@@ -547,9 +568,10 @@ fn test_empty_denoms_list() {
547568

548569
#[test]
549570
fn test_two_handlers_call() {
550-
let mut app = mock_app();
571+
let deps = mock_dependencies();
572+
let sender_address = deps.api.addr_make(SENDER_ADDR);
551573

552-
let sender_address = Addr::unchecked(SENDER_ADDR);
574+
let mut app = mock_app(sender_address.clone());
553575

554576
let ueth_handler_contract = instantiate_handler_contract(&mut app);
555577
let untrn_handler_contract = instantiate_handler_contract(&mut app);
@@ -560,7 +582,7 @@ fn test_two_handlers_call() {
560582
&mut app,
561583
rewards_manager_code_id,
562584
InstantiateMsg {
563-
owner: OWNER_ADDR.to_string(),
585+
owner: deps.api.addr_make(OWNER_ADDR).to_string(),
564586
},
565587
);
566588

@@ -575,7 +597,7 @@ fn test_two_handlers_call() {
575597

576598
let amount = coins(55, "untrn");
577599
let _ = app
578-
.send_tokens(sender_address, rewards_manager_contract.clone(), &amount)
600+
.send_tokens(sender_address.clone(), rewards_manager_contract.clone(), &amount)
579601
.unwrap();
580602

581603
let ueth_handler_config = HandlerConfig {
@@ -592,7 +614,7 @@ fn test_two_handlers_call() {
592614

593615
let _res = app
594616
.execute_contract(
595-
Addr::unchecked(OWNER_ADDR),
617+
deps.api.addr_make(OWNER_ADDR),
596618
rewards_manager_contract.clone(),
597619
&ExecuteMsg::AddHandler {
598620
config: ueth_handler_config.clone(),
@@ -603,7 +625,7 @@ fn test_two_handlers_call() {
603625

604626
let _res = app
605627
.execute_contract(
606-
Addr::unchecked(OWNER_ADDR),
628+
deps.api.addr_make(OWNER_ADDR),
607629
rewards_manager_contract.clone(),
608630
&ExecuteMsg::AddHandler {
609631
config: untrn_handler_config.clone(),
@@ -614,7 +636,7 @@ fn test_two_handlers_call() {
614636

615637
let res = app
616638
.execute_contract(
617-
Addr::unchecked(OWNER_ADDR),
639+
deps.api.addr_make(OWNER_ADDR),
618640
rewards_manager_contract.clone(),
619641
&ExecuteMsg::ExchangeRewards {
620642
denoms: vec!["ueth".to_string(), "untrn".to_string()],

0 commit comments

Comments
 (0)