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

consensus: Revert to last common ancestor #1263

Merged
merged 6 commits into from
Jan 23, 2024
Merged

consensus: Revert to last common ancestor #1263

merged 6 commits into from
Jan 23, 2024

Conversation

goshawk-3
Copy link
Contributor

@goshawk-3 goshawk-3 commented Jan 19, 2024

fixes #1260

@goshawk-3 goshawk-3 changed the title Fix 1260 consensus: Revert to last common ancestor Jan 19, 2024
@goshawk-3 goshawk-3 marked this pull request as ready for review January 19, 2024 13:10
fed-franz
fed-franz previously approved these changes Jan 19, 2024
Copy link
Contributor

@fed-franz fed-franz left a comment

Choose a reason for hiding this comment

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

LGTM
Just a nitpick comment

rusk/tests/services/transfer.rs Outdated Show resolved Hide resolved
ureeves
ureeves previously approved these changes Jan 22, 2024
@goshawk-3 goshawk-3 dismissed stale reviews from ureeves and fed-franz via a3b1240 January 22, 2024 12:26
@goshawk-3 goshawk-3 requested a review from fed-franz January 22, 2024 12:42
Copy link
Member

@herr-seppia herr-seppia left a comment

Choose a reason for hiding this comment

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

LGTM

@goshawk-3 goshawk-3 merged commit 7e20ade into master Jan 23, 2024
3 checks passed
@goshawk-3 goshawk-3 deleted the fix-1260 branch January 23, 2024 07:40
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.

consensus: Revert to last common ancestor
4 participants