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

Revert "Apply transaction batches in periodic intervals (#4504)" #4852

Merged
merged 2 commits into from
Dec 20, 2023

Conversation

scottschurr
Copy link
Collaborator

High Level Overview of Change

This reverts commit 002893f.

There were two files with conflicts in the automated revert:

  • src/ripple/rpc/impl/RPCHelpers.h and
  • src/test/rpc/JSONRPC_test.cpp

Those files were manually resolved.

Context of Change

There is currently no evidence that any problems were introduced by #4504. However something is misbehaving on the current state of develop, and pull request #4504 was identified as a possible suspect.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)

This reverts commit 002893f.

Therefore two files with conflicts in the automated revert:
- src/ripple/rpc/impl/RPCHelpers.h and
- src/test/rpc/JSONRPC_test.cpp
Those files were manually resolved.

There is currently no evidence that any problems were introduced
by XRPLF#4504.  However something is misbehaving on the current state
of develop, and pull request XRPLF#4504 was identified as a possible
suspect.
@intelliot intelliot added this to the 2.0.0 milestone Dec 19, 2023
@ckeshava
Copy link
Collaborator

the revert looks good to me 👍

@ckeshava
Copy link
Collaborator

I was slightly perplexed by the Github UI. It displays a different hash of f9e5cc3 for the specified commit in the PR page. But, this hash object does not exist in git log

image

@intelliot
Copy link
Collaborator

intelliot commented Dec 19, 2023

f9e5cc3 was the commit hash before it was brought up-to-date with develop and then squash-merged.

002893f, which is reverted by this PR, is the correct commit to revert.

@ckeshava
Copy link
Collaborator

i see, thanks for the explanation 👍

Copy link
Collaborator

@ximinez ximinez left a comment

Choose a reason for hiding this comment

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

Looks like a clean revert of the original PR.

@intelliot intelliot merged commit c53a5e7 into XRPLF:develop Dec 20, 2023
16 checks passed
legleux pushed a commit to legleux/rippled that referenced this pull request Jan 27, 2024
…XRPLF#4852)

This reverts commit 002893f.

There were two files with conflicts in the automated revert:

- src/ripple/rpc/impl/RPCHelpers.h and
- src/test/rpc/JSONRPC_test.cpp

Those files were manually resolved.
legleux pushed a commit to legleux/rippled that referenced this pull request Jan 27, 2024
…XRPLF#4852)

This reverts commit 002893f.

There were two files with conflicts in the automated revert:

- src/ripple/rpc/impl/RPCHelpers.h and
- src/test/rpc/JSONRPC_test.cpp

Those files were manually resolved.
@ximinez ximinez mentioned this pull request Apr 10, 2024
3 tasks
sophiax851 pushed a commit to sophiax851/rippled that referenced this pull request Jun 12, 2024
…XRPLF#4852)

This reverts commit 002893f.

There were two files with conflicts in the automated revert:

- src/ripple/rpc/impl/RPCHelpers.h and
- src/test/rpc/JSONRPC_test.cpp

Those files were manually resolved.
@scottschurr scottschurr deleted the revert-4504 branch July 31, 2024 20:02
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.

4 participants