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

Backport #1379 #1401 #1418 into v3.x.x and fix tests #1439

Merged
merged 6 commits into from
Oct 20, 2022
Merged

Conversation

agryaznov
Copy link
Contributor

@agryaznov agryaznov commented Oct 18, 2022

Following three PRs to backport:

+ tests fixed

agryaznov and others added 5 commits October 18, 2022 13:31
… sending payments with contract msg calls (#1379)

* first ver.: transfer_in api function implememted but we can't have it in on-chain env

* transfer_in moved to test_api

* doc + example updated

* Update examples/contract-transfer/lib.rs

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>

* use stmt moved to macro

* docs and nitty gritties

* moved the macro to the test mod

* spell fix

* next review round suggestions applied

* Use four spaces for macro indentation

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>
Co-authored-by: Hernando Castano <hernando@hcastano.com>
@agryaznov agryaznov changed the base branch from master to v3.x.x October 18, 2022 13:36
@agryaznov agryaznov force-pushed the ag-v3.x.x branch 5 times, most recently from c5a81ad to 23d61d4 Compare October 19, 2022 11:02
@agryaznov agryaznov changed the title Backport #1379 #1401 #1416 #1418 into v3.x.x and fix tests Backport #1379 #1401 #1418 into v3.x.x and fix tests Oct 19, 2022
@agryaznov
Copy link
Contributor Author

CI passes (except ink-waterfall) for the following toolchain:

nightly-2022-05-05-x86_64-unknown-linux-gnu (default)
rustc 1.62.0-nightly (4c60a0ea5 2022-05-04)

Making it all green for the latest Rust would require additional efforts (worth devoting a separate PR if needed).

ink_waterfall (currently fails), meanwhile, was already broken on the previous release (though for a different reason)

Copy link
Contributor

@HCastano HCastano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@agryaznov agryaznov merged commit f06c961 into v3.x.x Oct 20, 2022
@agryaznov agryaznov deleted the ag-v3.x.x branch October 20, 2022 17:27
@agryaznov agryaznov mentioned this pull request Oct 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants