Finish v0.11 migration #111
Conversation
|
Ey, thanks for finishing this! I can review it today / tomorrow. |
contracts/cw20-base/src/contract.rs
Outdated
| @@ -902,7 +911,7 @@ mod tests { | |||
| ); | |||
|
|
|||
| // run the migration | |||
| let env = mock_env(HumanAddr::from("admin"), &[]); | |||
| let (env, _info) = mock_env_info(HumanAddr::from("admin"), &[]); | |||
There was a problem hiding this comment.
don't we need to add info to migrate so it compiles in wasm mode?
There was a problem hiding this comment.
Yes you are right. I did it locally but I suppose you are working on it don't want to tip toes.
|
@maurolacy can you give a quick review on these changes before merging them into your branch (you should be able to do that). Then I can merge your branch into master. And we have 0.11 support! I guess I wait til Monday to cut the v0.3.0 release |
| .collect(); | ||
|
|
||
| Ok(ProposalListResponse { proposals: props? }) | ||
| } | ||
|
|
||
| fn map_proposal(item: StdResult<(Vec<u8>, Proposal)>) -> StdResult<ProposalResponse> { | ||
| fn map_proposal( | ||
| block: &BlockInfo, |
| Duration::Time(duration) => mock_env_time(VOTER4, env.block.time + duration + 1), | ||
| Duration::Height(duration) => mock_env_height(VOTER4, env.block.height + duration + 1), | ||
| Duration::Time(duration) => mock_env_time(duration + 1), | ||
| Duration::Height(duration) => mock_env_height(duration + 1), |
contracts/cw721-base/src/contract.rs
Outdated
| }) | ||
| .filter_map(|item| match item { | ||
| Ok((k, expires)) => { | ||
| // we remove all expired operators from the result |
There was a problem hiding this comment.
Sure about this? I'm not sure, but listing expired operators can be useful for debugging / accountability issues.
There was a problem hiding this comment.
I guess I can keep them, but then add another flag to the response "is_expired: bool". Is it useful info on the client, without forcing calculations there
There was a problem hiding this comment.
Good idea.
Another option would be to add a boolean flag to the query, i. e. include_expired or so.
There was a problem hiding this comment.
Should be addressed here: 09b7b31
There was a problem hiding this comment.
Another option would be to add a boolean flag to the query, i. e. include_expired or so.
Just read this. I actually prefer this idea
There was a problem hiding this comment.
I will undo my change and redo it the other way. Let me know which commit you prefer.
There was a problem hiding this comment.
I too think the query option is better.
contracts/cw721-base/src/contract.rs
Outdated
| info.approvals | ||
| .iter() | ||
| .filter(|apr| !apr.expires.is_expired(block)) |
There was a problem hiding this comment.
I think I didn't update this part... Just the above.
ethanfrey
force-pushed
the
finish-v0.11-migration
branch
from
09b7b31 to
0525a34
Compare
This finishes up the great work started in @maurolacy 's branch and makes a final cosmwasm-plus PR for the upgrades