Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

v1.16: Add from field for message tracking (backport of #32725)#32746

Merged
gregcusack merged 1 commit intov1.16from
mergify/bp/v1.16/pr-32725
Aug 9, 2023
Merged

v1.16: Add from field for message tracking (backport of #32725)#32746
gregcusack merged 1 commit intov1.16from
mergify/bp/v1.16/pr-32725

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 7, 2023

This is an automatic backport of pull request #32725 done by Mergify.
Cherry-pick of 5c86f89 has failed:

On branch mergify/bp/v1.16/pr-32725
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit 5c86f89bc7.
  (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:
	modified:   gossip/src/crds_gossip_push.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/crds.rs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify Bot added the conflicts label Aug 7, 2023
@gregcusack
Copy link
Copy Markdown
Contributor

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 9, 2023

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/1)
Auto-merging gossip/src/crds.rs
CONFLICT (content): Merge conflict in gossip/src/crds.rs
error: could not apply cc3f1cc39... Add from field for message tracking (#32725)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply cc3f1cc39... Add from field for message tracking (#32725)

err-code: 0DD2B

@gregcusack
Copy link
Copy Markdown
Contributor

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 9, 2023

refresh

✅ Pull request refreshed

behzadnouri
behzadnouri previously approved these changes Aug 9, 2023
* we only want to report received message signatures on PUSH requests, not PULL requests

* woops accidently had it has LocalMessage not PushMessage

* switch from match to if let statement

* convert if let to matches macro

* add in from field in PushMessage for message tracking

* update with cargo fmt

* remove display for gossip route and add lifetime param to pubkey reference in gossiproute enum

* forgot to run fmt
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 9, 2023

Codecov Report

Merging #32746 (649bd64) into v1.16 (b46d35a) will increase coverage by 0.0%.
Report is 1 commits behind head on v1.16.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##            v1.16   #32746   +/-   ##
=======================================
  Coverage    81.9%    81.9%           
=======================================
  Files         762      762           
  Lines      207726   207727    +1     
=======================================
+ Hits       170289   170310   +21     
+ Misses      37437    37417   -20     

@gregcusack gregcusack merged commit b4cefdf into v1.16 Aug 9, 2023
@gregcusack gregcusack deleted the mergify/bp/v1.16/pr-32725 branch August 9, 2023 21:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants