Skip to content
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.

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

feat: merge 0.14.0 #122

Merged
merged 232 commits into from
Jun 22, 2021
Merged

feat: merge 0.14.0 #122

merged 232 commits into from
Jun 22, 2021

Conversation

shiki-tak
Copy link
Contributor

Closes: #121

Description

Motivation and context

How has this been tested?

Checklist:

  • I followed the contributing guidelines.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.

maurolacy and others added 30 commits March 13, 2021 18:49
Implement interior mutability consistently and run concurrency tests
@shiki-tak shiki-tak force-pushed the shiki_tak/issues/121 branch 2 times, most recently from ee7cf65 to e258f1a Compare June 10, 2021 10:59
@shiki-tak shiki-tak force-pushed the shiki_tak/issues/121 branch from e258f1a to ac5ca78 Compare June 10, 2021 11:27
@brew0722
Copy link
Contributor

We decided not to use the develop branch, so I think we need to change the target to the main branch.
Others are LGTM.

@shiki-tak shiki-tak changed the base branch from develop to main June 15, 2021 06:13
@whylee259
Copy link
Contributor

whylee259 commented Jun 17, 2021

In packages/vm/src/testing/mock.rs,
The upstream has removed canonicalize_cost and humanize_cost from MockApi, but the merge results leave them as before. Is it intended?

@shiki-tak
Copy link
Contributor Author

In packages/vm/src/testing/mock.rs,
The upstream has removed canonicalize_cost and humanize_cost from MockApi, but the merge results leave them as before. Is it intended?

You mean this?
https://github.com/line/cosmwasm/pull/122/files#diff-2503556807c26c0cb326754f3c3184ec7f62630ec3c6f548e5a6607947f8023dR127

The upstream MockApi uses GAS_COST_CANONICALIZE as a constant, but since we added the following test, we left it as the test fails with a constant.
https://github.com/line/cosmwasm/pull/122/files#diff-2503556807c26c0cb326754f3c3184ec7f62630ec3c6f548e5a6607947f8023dR265

@whylee259
Copy link
Contributor

whylee259 commented Jun 17, 2021

minor

https://github.com/line/cosmwasm/pull/122/files#diff-2503556807c26c0cb326754f3c3184ec7f62630ec3c6f548e5a6607947f8023dL52-L58
The deprecated initializer can be removed.

@shiki-tak shiki-tak force-pushed the shiki_tak/issues/121 branch from be3d12e to 8e2e800 Compare June 22, 2021 05:41
@shiki-tak shiki-tak force-pushed the shiki_tak/issues/121 branch from 8e2e800 to ed9b9e7 Compare June 22, 2021 05:58
@shiki-tak shiki-tak force-pushed the shiki_tak/issues/121 branch from 130462b to 13b89e2 Compare June 22, 2021 06:14
@whylee259 whylee259 merged commit 25690c3 into main Jun 22, 2021
@whylee259 whylee259 deleted the shiki_tak/issues/121 branch July 7, 2021 04:53
@shiki-tak shiki-tak restored the shiki_tak/issues/121 branch December 2, 2021 06:21
@loloicci loloicci deleted the shiki_tak/issues/121 branch June 3, 2022 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate v0.14(w/ wasmd)
8 participants