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.

Sign up for GitHub

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

Fix a few bugs in revalidate (mini) #16401

Merged
merged 6 commits into from
Jan 14, 2025
Merged

Fix a few bugs in revalidate (mini) #16401

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bee176f
Rename t -> t_initial
georgeee Dec 5, 2024
426cc1c
Rename t' -> t
georgeee Dec 5, 2024
430ddd2
Fix two similar issues in revalidate
georgeee Dec 5, 2024
8ff806a
Rename three local vars
georgeee Dec 5, 2024
badac1d
Rename two more local vars
georgeee Dec 5, 2024
1b95a6e
Fix handling of applicable_by_fee in revalidate
georgeee Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/lib/network_pool/indexed_pool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,14 +739,14 @@ let revalidate :
then (
[%log debug]
"Account no longer has permission to send; dropping queue" ;
let dropped, t'' = remove_with_dependents_exn' t_initial first_cmd in
(t'', Sequence.append dropped_acc dropped) )
let dropped, t_updated = remove_with_dependents_exn' t first_cmd in
Copy link
Member

Choose a reason for hiding this comment

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

Good catch!

(t_updated, Sequence.append dropped_acc dropped) )
else if Account_nonce.(account.nonce < first_nonce) then (
[%log debug]
"Current account nonce precedes first nonce in queue; dropping \
queue" ;
let dropped, t'' = remove_with_dependents_exn' t_initial first_cmd in
(t'', Sequence.append dropped_acc dropped) )
let dropped, t_updated = remove_with_dependents_exn' t first_cmd in
(t_updated, Sequence.append dropped_acc dropped) )
else
(* current_nonce >= first_nonce *)
let first_applicable_nonce_index =
Expand Down