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

Add message_info and deprecate mock_info (backport #2160) #2161

Merged
merged 9 commits into from
Jun 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2024

3 reasons for this:

  1. The function is a constructor that does not mock anything
  2. We have owned Addr instances and don't want to call .as_str() all the time
  3. mock_info is unsafe as it internally uses Addr::unchecked

TODO:

(cherry picked from commit 70f8809)

# Conflicts:
#	packages/std/src/testing/mod.rs
(cherry picked from commit 529f871)
(cherry picked from commit fa77163)
(cherry picked from commit 55426eb)
(cherry picked from commit f686a1a)
@mergify mergify bot added the conflicts label May 31, 2024
Copy link
Contributor Author

mergify bot commented May 31, 2024

Cherry-pick of 70f8809 has failed:

On branch mergify/bp/release/2.0/pr-2160
Your branch is up to date with 'origin/release/2.0'.

You are currently cherry-picking commit 70f880921.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   packages/std/src/testing/message_info.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/std/src/testing/mod.rs

Cherry-pick of b4d551e has failed:

On branch mergify/bp/release/2.0/pr-2160
Your branch is ahead of 'origin/release/2.0' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b4d551e75.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 31, 2024
3 tasks
(cherry picked from commit b4d551e)

# Conflicts:
#	CHANGELOG.md
@webmaster128 webmaster128 force-pushed the mergify/bp/release/2.0/pr-2160 branch from cd6a195 to 5a5acd0 Compare May 31, 2024 15:50
@webmaster128 webmaster128 requested a review from chipshort May 31, 2024 15:51
@chipshort chipshort merged commit dd178f9 into release/2.0 Jun 3, 2024
29 checks passed
@chipshort chipshort deleted the mergify/bp/release/2.0/pr-2160 branch June 3, 2024 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants