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

merge-queue: embarking main (caac71a) and [#3940 + #4015] together #4096

Closed
wants to merge 46 commits into from
Closed

merge-queue: embarking main (caac71a) and [#3940 + #4015] together #4096

Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
afd796c
style(ci): comply with https://json.schemastore.org/github-workflow.json
gustavovalverde Mar 23, 2022
c522d62
fix(mergify): use correct name for macos
gustavovalverde Mar 23, 2022
27b1700
style(actions): revert to single quotes
gustavovalverde Mar 23, 2022
22961da
style: lint dependabot and mergify conf files
gustavovalverde Mar 23, 2022
7047f0a
style: remove conditions with missing context
gustavovalverde Mar 23, 2022
3d68d05
Merge branch 'main' into fix-actions-indentation
gustavovalverde Mar 30, 2022
bc8444e
imp(lint): automate GH Actions linting
gustavovalverde Mar 30, 2022
dd011eb
fix(lint): some actions need to be triggered by PR event
gustavovalverde Mar 30, 2022
db75beb
Add a rpc queue
oxarbitrage Mar 30, 2022
706c89d
Implement the rpc queue
oxarbitrage Mar 31, 2022
e3e26e9
Add rpc queue tests
oxarbitrage Mar 31, 2022
3c3ef7b
Remove mutex, use broadcast channel
oxarbitrage Mar 31, 2022
a7547ae
Have order and limit in the queue
oxarbitrage Apr 1, 2022
d85a6b6
fix multiple transactions channel
oxarbitrage Apr 2, 2022
414d5ce
Use a network argument
oxarbitrage Apr 2, 2022
d17329f
Use chain tip to calculate block spacing
oxarbitrage Apr 2, 2022
2baff36
Add extra time
oxarbitrage Apr 2, 2022
1bb7279
Finalize the state check test
oxarbitrage Apr 2, 2022
473fd02
Add a retry test
oxarbitrage Apr 2, 2022
1d2879d
Fix description
oxarbitrage Apr 2, 2022
a88561d
fix some docs
oxarbitrage Apr 3, 2022
e83fe4f
add additional empty check to `Runner::run`
oxarbitrage Apr 3, 2022
22543b7
fix(lint): consider all workflow YAMLs
gustavovalverde Apr 4, 2022
1fa586b
Use the same paths in the patch file
gustavovalverde Apr 4, 2022
9003ecc
revert: keep condition as is
gustavovalverde Apr 4, 2022
0f5a200
add TODO
gustavovalverde Apr 4, 2022
5ff46fc
Merge branch 'main' into fix-actions-indentation
gustavovalverde Apr 4, 2022
9dc2531
remove non used method
oxarbitrage Apr 5, 2022
f825281
ignore some errors
oxarbitrage Apr 5, 2022
b2923c3
fix some docs
oxarbitrage Apr 5, 2022
12ce449
add a panic checker to the queue
oxarbitrage Apr 5, 2022
05c8797
add missing file changes for panic checker
oxarbitrage Apr 5, 2022
e018590
skip checks and retries if height has not changed
oxarbitrage Apr 5, 2022
4afcfba
change constants
oxarbitrage Apr 5, 2022
bba48a2
reduce the number of queue test cases
oxarbitrage Apr 5, 2022
bfd4a04
remove suggestion
oxarbitrage Apr 5, 2022
4e3229b
change best tip check
oxarbitrage Apr 5, 2022
234945f
fix: add missing checkpoint_sync input
gustavovalverde Apr 5, 2022
ecfb7ed
fix(rpc): Check for panics in the transaction queue (#4046)
teor2345 Apr 6, 2022
b338dc9
Merge branch 'main' into fix-actions-indentation
gustavovalverde Apr 6, 2022
31de051
Merge remote-tracking branch 'origin/main' into issue3654
teor2345 Apr 7, 2022
2890b85
Fixup a new RPC test from the main branch
teor2345 Apr 7, 2022
79b5937
Merge branch 'main' into issue3654
mergify[bot] Apr 10, 2022
de89656
Merge branch 'main' into fix-actions-indentation
mergify[bot] Apr 11, 2022
56a84a6
Merge of #3940
mergify[bot] Apr 12, 2022
ecf90e5
Merge of #4015
mergify[bot] Apr 12, 2022
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
Prev Previous commit
Next Next commit
remove suggestion
  • Loading branch information
@oxarbitrage
oxarbitrage committed Apr 5, 2022
commit bfd4a04ae0f31eca5b3b09f09a1f61b52278607d
3 changes: 1 addition & 2 deletions zebra-rpc/src/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ mod tests;
/// The approximate target number of blocks a transaction can be in the queue.
const NUMBER_OF_BLOCKS_TO_EXPIRE: i64 = 5;

/// Size of the queue and channel. Suggested value is equal to
/// `mempool::downloads::MAX_INBOUND_CONCURRENCY`
/// Size of the queue and channel.
const CHANNEL_AND_QUEUE_CAPACITY: usize = 20;

/// The height to use in spacing calculation if we don't have a chain tip.
Expand Down