Skip to content

cw1-whitelist-ng: Slight messages parsing improvement #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethanfrey merged 1 commit into from
Nov 2, 2021
Merged

cw1-whitelist-ng: Slight messages parsing improvement #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 20 additions & 28 deletions contracts/cw1-whitelist-ng/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,24 +69,20 @@ impl<T> Cw1WhitelistContract<T> {
where
T: DeserializeOwned,
{
let mut errs = vec![];

match from_slice::<Cw1ExecMsg<T>>(msg) {
let cw1_err = match from_slice::<Cw1ExecMsg<T>>(msg) {
Ok(msg) => return msg.dispatch(deps, env, info, self),
Err(err) => errs.push(err),
}
Err(err) => err,
};

match from_slice::<WhitelistExecMsg>(msg) {
let whitelist_err = match from_slice::<WhitelistExecMsg>(msg) {
Ok(msg) => return msg.dispatch(deps, env, info, self),
Err(err) => errs.push(err),
}
Err(err) => err,
};

let msg: String = errs
.into_iter()
.flat_map(|err| {
std::iter::once(err.to_string()).chain(std::iter::once("\n".to_owned()))
})
.collect();
let msg = format!(
"While parsing Cw1WhitelistExecMsg\n As Cw1ExecMsg: {}\n As WhitelistExecMsg: {}",
cw1_err, whitelist_err
);

let err = StdError::parse_err("Cw1WhitelistExecMsg", msg);
Err(err.into())
Expand All @@ -101,24 +97,20 @@ impl<T> Cw1WhitelistContract<T> {
where
T: DeserializeOwned,
{
let mut errs = vec![];

match from_slice::<Cw1QueryMsg<T>>(msg) {
let cw1_err = match from_slice::<Cw1QueryMsg<T>>(msg) {
Ok(msg) => return msg.dispatch(deps, env, self),
Err(err) => errs.push(err),
}
Err(err) => err,
};

match from_slice::<WhitelistQueryMsg>(msg) {
let whitelist_err = match from_slice::<WhitelistQueryMsg>(msg) {
Ok(msg) => return msg.dispatch(deps, env, self),
Err(err) => errs.push(err),
}
Err(err) => err,
};

let msg: String = errs
.into_iter()
.flat_map(|err| {
std::iter::once(err.to_string()).chain(std::iter::once("\n".to_owned()))
})
.collect();
let msg = format!(
"While parsing Cw1WhitelistQueryMsg\n As Cw1QueryMsg: {}\n As WhitelistQueryMsg: {}",
cw1_err, whitelist_err
);

let err = StdError::parse_err("Cw1WhitelistExecMsg", msg);
Err(err.into())
Expand Down