Skip to content

Commit 75b913b

Browse files
committed
Merge branch 'develop' into fix/mempool-query
2 parents 8754877 + e31481d commit 75b913b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+5886
-7813
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,13 @@ jobs:
7070
- test-name: tests::neon_integrations::lockup_integration
7171
- test-name: tests::neon_integrations::most_recent_utxo_integration_test
7272
- test-name: tests::neon_integrations::run_with_custom_wallet
73-
- test-name: tests::neon_integrations::test_competing_miners_build_anchor_blocks_and_microblocks_on_same_chain
7473
- test-name: tests::neon_integrations::test_competing_miners_build_anchor_blocks_on_same_chain_without_rbf
7574
- test-name: tests::neon_integrations::test_one_miner_build_anchor_blocks_on_same_chain_without_rbf
7675
- test-name: tests::signer::v0::tenure_extend_after_2_bad_commits
7776
- test-name: tests::stackerdb::test_stackerdb_event_observer
7877
- test-name: tests::stackerdb::test_stackerdb_load_store
79-
# Microblock tests that are no longer needed on every CI run
80-
# (microblocks are unsupported starting in Epoch 2.5)
81-
- test-name: tests::neon_integrations::bad_microblock_pubkey
82-
- test-name: tests::neon_integrations::microblock_fork_poison_integration_test
83-
- test-name: tests::neon_integrations::microblock_integration_test
84-
- test-name: tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
85-
- test-name: tests::neon_integrations::microblock_limit_hit_integration_test
86-
- test-name: tests::neon_integrations::microblock_miner_multiple_attempts
87-
- test-name: tests::neon_integrations::test_problematic_microblocks_are_not_mined
88-
- test-name: tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
89-
- test-name: tests::neon_integrations::runtime_overflow_unconfirmed_microblocks_integration_test
90-
- test-name: tests::neon_integrations::size_overflow_unconfirmed_invalid_stream_microblocks_integration_test
91-
- test-name: tests::neon_integrations::size_overflow_unconfirmed_microblocks_integration_test
92-
- test-name: tests::neon_integrations::size_overflow_unconfirmed_stream_microblocks_integration_test
93-
- test-name: tests::epoch_25::microblocks_disabled
9478
# Epoch tests are covered by the epoch-tests CI workflow, and don't need to run
9579
# on every PR (for older epochs)
96-
- test-name: tests::epoch_205::bigger_microblock_streams_in_2_05
9780
- test-name: tests::epoch_205::test_cost_limit_switch_version205
9881
- test-name: tests::epoch_205::test_dynamic_db_method_costs
9982
- test-name: tests::epoch_205::test_exact_block_costs

.github/workflows/epoch-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
max-parallel: 32
3030
matrix:
3131
test-name:
32-
- tests::epoch_205::bigger_microblock_streams_in_2_05
3332
- tests::epoch_205::test_cost_limit_switch_version205
3433
- tests::epoch_205::test_dynamic_db_method_costs
3534
- tests::epoch_205::test_exact_block_costs

Cargo.lock

Lines changed: 106 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)