Skip to content

Commit 4a97ef4

Browse files
reuvenporeuvenpo
authored
Merge pull request #1 from baedrik/minor-changes
minor changes discussed
2 parents 31994fa + 151c211 commit 4a97ef4

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

‎src/contract.rs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
166166

167167
// Mint
168168
HandleMsg::Mint {
169-
amount, address, ..
170-
} => try_mint(deps, env, address, amount),
169+
recipient, amount, ..
170+
} => try_mint(deps, env, recipient, amount),
171171

172172
// Other
173173
HandleMsg::ChangeAdmin { address, .. } => change_admin(deps, env, address),
@@ -1948,6 +1948,7 @@ mod tests {
19481948

19491949
let handle_msg = HandleMsg::Redeem {
19501950
amount: Uint128(1000),
1951+
denom: None,
19511952
padding: None,
19521953
};
19531954
let handle_result = handle(&mut deps, mock_env("butler", &[]), handle_msg);
@@ -2049,8 +2050,8 @@ mod tests {
20492050
let supply = ReadonlyConfig::from_storage(&deps.storage).total_supply();
20502051
let mint_amount: u128 = 100;
20512052
let handle_msg = HandleMsg::Mint {
2053+
recipient: HumanAddr("lebron".to_string()),
20522054
amount: Uint128(mint_amount),
2053-
address: HumanAddr("lebron".to_string()),
20542055
padding: None,
20552056
};
20562057
let handle_result = handle(&mut deps, mock_env("admin", &[]), handle_msg);
@@ -2157,6 +2158,7 @@ mod tests {
21572158

21582159
let withdraw_msg = HandleMsg::Redeem {
21592160
amount: Uint128(5000),
2161+
denom: None,
21602162
padding: None,
21612163
};
21622164
let handle_result = handle(&mut deps, mock_env("lebron", &[]), withdraw_msg);
@@ -2205,6 +2207,7 @@ mod tests {
22052207

22062208
let withdraw_msg = HandleMsg::Redeem {
22072209
amount: Uint128(5000),
2210+
denom: None,
22082211
padding: None,
22092212
};
22102213
let handle_result = handle(&mut deps, mock_env("lebron", &[]), withdraw_msg);
@@ -2243,17 +2246,17 @@ mod tests {
22432246
assert!(ensure_success(handle_result.unwrap()));
22442247

22452248
let handle_msg = HandleMsg::Mint {
2249+
recipient: HumanAddr("bob".to_string()),
22462250
amount: Uint128(100),
22472251
padding: None,
2248-
address: HumanAddr("bob".to_string()),
22492252
};
22502253
let handle_result = handle(&mut deps, mock_env("bob", &[]), handle_msg);
22512254
assert!(ensure_success(handle_result.unwrap()));
22522255

22532256
let handle_msg = HandleMsg::Mint {
2257+
recipient: HumanAddr("bob".to_string()),
22542258
amount: Uint128(100),
22552259
padding: None,
2256-
address: HumanAddr("bob".to_string()),
22572260
};
22582261
let handle_result = handle(&mut deps, mock_env("admin", &[]), handle_msg);
22592262
let error = extract_error_msg(handle_result);
@@ -2288,17 +2291,17 @@ mod tests {
22882291
assert!(ensure_success(handle_result.unwrap()));
22892292

22902293
let handle_msg = HandleMsg::Mint {
2294+
recipient: HumanAddr("bob".to_string()),
22912295
amount: Uint128(100),
22922296
padding: None,
2293-
address: HumanAddr("bob".to_string()),
22942297
};
22952298
let handle_result = handle(&mut deps, mock_env("bob", &[]), handle_msg);
22962299
assert!(ensure_success(handle_result.unwrap()));
22972300

22982301
let handle_msg = HandleMsg::Mint {
2302+
recipient: HumanAddr("bob".to_string()),
22992303
amount: Uint128(100),
23002304
padding: None,
2301-
address: HumanAddr("bob".to_string()),
23022305
};
23032306
let handle_result = handle(&mut deps, mock_env("admin", &[]), handle_msg);
23042307
assert!(ensure_success(handle_result.unwrap()));
@@ -2332,18 +2335,18 @@ mod tests {
23322335
assert!(ensure_success(handle_result.unwrap()));
23332336

23342337
let handle_msg = HandleMsg::Mint {
2338+
recipient: HumanAddr("bob".to_string()),
23352339
amount: Uint128(100),
23362340
padding: None,
2337-
address: HumanAddr("bob".to_string()),
23382341
};
23392342
let handle_result = handle(&mut deps, mock_env("bob", &[]), handle_msg);
23402343
let error = extract_error_msg(handle_result);
23412344
assert!(error.contains("allowed to minter accounts only"));
23422345

23432346
let handle_msg = HandleMsg::Mint {
2347+
recipient: HumanAddr("bob".to_string()),
23442348
amount: Uint128(100),
23452349
padding: None,
2346-
address: HumanAddr("bob".to_string()),
23472350
};
23482351
let handle_result = handle(&mut deps, mock_env("admin", &[]), handle_msg);
23492352
let error = extract_error_msg(handle_result);
@@ -2358,18 +2361,18 @@ mod tests {
23582361
assert!(ensure_success(handle_result.unwrap()));
23592362

23602363
let handle_msg = HandleMsg::Mint {
2364+
recipient: HumanAddr("bob".to_string()),
23612365
amount: Uint128(100),
23622366
padding: None,
2363-
address: HumanAddr("bob".to_string()),
23642367
};
23652368
let handle_result = handle(&mut deps, mock_env("bob", &[]), handle_msg);
23662369
let error = extract_error_msg(handle_result);
23672370
assert!(error.contains("allowed to minter accounts only"));
23682371

23692372
let handle_msg = HandleMsg::Mint {
2373+
recipient: HumanAddr("bob".to_string()),
23702374
amount: Uint128(100),
23712375
padding: None,
2372-
address: HumanAddr("bob".to_string()),
23732376
};
23742377
let handle_result = handle(&mut deps, mock_env("admin", &[]), handle_msg);
23752378
let error = extract_error_msg(handle_result);
@@ -2524,7 +2527,6 @@ mod tests {
25242527
owner: HumanAddr("giannis".to_string()),
25252528
spender: HumanAddr("lebron".to_string()),
25262529
key: vk1.0.clone(),
2527-
padding: None,
25282530
};
25292531
let query_result = query(&deps, query_msg);
25302532
assert!(
@@ -2569,7 +2571,6 @@ mod tests {
25692571
owner: HumanAddr("giannis".to_string()),
25702572
spender: HumanAddr("lebron".to_string()),
25712573
key: vk1.0.clone(),
2572-
padding: None,
25732574
};
25742575
let query_result = query(&deps, query_msg);
25752576
let allowance = match from_binary(&query_result.unwrap()).unwrap() {
@@ -2582,7 +2583,6 @@ mod tests {
25822583
owner: HumanAddr("giannis".to_string()),
25832584
spender: HumanAddr("lebron".to_string()),
25842585
key: vk2.0.clone(),
2585-
padding: None,
25862586
};
25872587
let query_result = query(&deps, query_msg);
25882588
let allowance = match from_binary(&query_result.unwrap()).unwrap() {
@@ -2595,7 +2595,6 @@ mod tests {
25952595
owner: HumanAddr("lebron".to_string()),
25962596
spender: HumanAddr("giannis".to_string()),
25972597
key: vk2.0.clone(),
2598-
padding: None,
25992598
};
26002599
let query_result = query(&deps, query_msg);
26012600
let allowance = match from_binary(&query_result.unwrap()).unwrap() {

‎src/msg.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ pub enum HandleMsg {
5252
// Native coin interactions
5353
Redeem {
5454
amount: Uint128,
55+
denom: Option<String>,
5556
padding: Option<String>,
5657
},
5758
Deposit {
@@ -121,8 +122,8 @@ pub enum HandleMsg {
121122

122123
// Mint
123124
Mint {
125+
recipient: HumanAddr,
124126
amount: Uint128,
125-
address: HumanAddr,
126127
padding: Option<String>,
127128
},
128129
AddMinters {
@@ -233,7 +234,6 @@ pub enum QueryMsg {
233234
owner: HumanAddr,
234235
spender: HumanAddr,
235236
key: String,
236-
padding: Option<String>,
237237
},
238238
Balance {
239239
address: HumanAddr,

‎tests/example-receiver/src/contract.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
3434
HandleMsg::Register { reg_addr, reg_hash } => try_register(deps, env, reg_addr, reg_hash),
3535
HandleMsg::Receive {
3636
sender,
37+
from,
3738
amount,
3839
msg,
39-
} => try_receive(deps, env, sender, amount, msg),
40+
} => try_receive(deps, env, sender, from, amount, msg),
4041
HandleMsg::Redeem {
4142
addr,
4243
hash,
@@ -112,6 +113,7 @@ pub fn try_receive<S: Storage, A: Api, Q: Querier>(
112113
deps: &mut Extern<S, A, Q>,
113114
env: Env,
114115
_sender: HumanAddr,
116+
_from: HumanAddr,
115117
_amount: Uint128,
116118
msg: Binary,
117119
) -> StdResult<HandleResponse> {
@@ -160,7 +162,7 @@ fn try_redeem<S: Storage, A: Api, Q: Querier>(
160162
});
161163
let redeem = CosmosMsg::Bank(BankMsg::Send {
162164
amount: vec![Coin::new(amount.u128(), "uscrt")],
163-
from_address: env.contract.address.clone(),
165+
from_address: env.contract.address,
164166
to_address: to,
165167
});
166168

‎tests/example-receiver/src/msg.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub enum HandleMsg {
2020
},
2121
Receive {
2222
sender: HumanAddr,
23+
from: HumanAddr,
2324
amount: Uint128,
2425
msg: Binary,
2526
},

0 commit comments

Comments
 (0)