stacks-network / stacks-core

86%

master: 86%

LAST BUILD ON BRANCH chore/fix_3.4_develop_merge_conflicts

branch: chore/fix_3.4_develop_merge_conflicts

CHANGE BRANCH

x

Reset

• chore/fix_3.4_develop_merge_conflicts
• chore/3.4.updates
• chore/adjust_signer_changelog
• chore/bump_versions
• chore/changelog-readmes
• chore/clarity-version-string
• chore/fix_3.4_master_merge_conflicts
• chore/fold-map-filter-optim
• chore/move-back-clarity-errors
• chore/perf-retain-values
• chore/rust-toolchain-1.94.0
• chore/update-activations
• chore/update_markdown
• chore/update_testnet_configs
• ci/improve-proptest-regression-filtering
• ci/proptest-nightly
• develop
• feat/epoch-3-5-ci-fixes
• feat/improved-const-callable
• feat/marf-u64-offset-pointers
• feat/non-blocking-event-delivery
• feat/pox_5_reward_set
• feat/reflink_validation
• feat/start-of-pox-5
• feat/stx-btc-ratio-incremental
• feat/unreachable-errors-alert
• fix/callable-equality
• fix/clarity-cli-panic
• fix/continue-in-signer
• fix/deprecation-errors
• fix/flaky-mock-miner-replay
• fix/flaky-walk-inbound-line-15
• fix/logic-error
• fix/ongoing-block-clear-on-fail
• fix/out-of-order-signatures
• fix/p2p-performance-improvements
• fix/shadow-block-pox-descendant
• fix/signer-cli-version
• gh-readonly-queue/develop/pr-6927-5cc77e4d47058cd15881f7b9b73549a412b42f3a
• gh-readonly-queue/develop/pr-6943-2cd0679e4add3cd90ee813f7bf925e62bc6508a0
• gh-readonly-queue/develop/pr-6992-0061b12d7458a3ea68698169cc318dc5a7545b16
• gh-readonly-queue/develop/pr-7003-2cc5c9fda0bb0b83951f91b7e638c590e4fde726
• gh-readonly-queue/develop/pr-7008-e389f4b59f5ef56e7e89d44117128de6993fcd6e
• gh-readonly-queue/develop/pr-7011-5af93fed9b57578f78f8c02122a4dd4d722762d6
• gh-readonly-queue/develop/pr-7013-e0b55e60b4d86afeab98d41ffe02b51c50937a32
• gh-readonly-queue/develop/pr-7015-1e36cefa9e422779ff0073af71e969eb1f10cf04
• gh-readonly-queue/develop/pr-7015-62f4c5a1a34af4c75242be146d49676abe4ebe59
• gh-readonly-queue/develop/pr-7015-b492d2c344503152905a5bfde9b476f097beda5b
• gh-readonly-queue/develop/pr-7017-148ec7059416de48759e4fdf5075945cd185755a
• gh-readonly-queue/develop/pr-7017-1e36cefa9e422779ff0073af71e969eb1f10cf04
• gh-readonly-queue/develop/pr-7017-c63e787225a54a623d5a44953e6dbd155807378e
• gh-readonly-queue/develop/pr-7018-1e36cefa9e422779ff0073af71e969eb1f10cf04
• gh-readonly-queue/develop/pr-7018-3f3dd8e1a1c4c1a2b629cc7e148bc9da7d262f00
• gh-readonly-queue/develop/pr-7018-54c67833508ff18d813adcaf265543f9a04b20b5
• gh-readonly-queue/develop/pr-7029-39976ac7e795b84b992e0dea5594bda493a77369
• gh-readonly-queue/develop/pr-7030-df513589a8e887b918fc6cc5c90a02d198951303
• gh-readonly-queue/develop/pr-7031-8b47a554a23f06806673eccc2b0d9e05f2d4caa2
• gh-readonly-queue/develop/pr-7041-08342a156253fc831c6fc944b96bad080deab6a7
• gh-readonly-queue/develop/pr-7044-c1df1dfd404ab2d5fb77e1b372206de1f5feb92f
• gh-readonly-queue/develop/pr-7045-5ae6ba7da0d0ab446a0ae46177c44450c8444849
• gh-readonly-queue/develop/pr-7053-6845b93762cb0f0abe80e90ecaf13fcf40b96081
• gh-readonly-queue/develop/pr-7054-5636db408e671595171e00501947e52cc0de6bec
• release/3.4.0.0.0
• release/3.4.0.0.0-rc1
• release/3.4.0.0.0-rc2
• test/flaky-signer-tests
• test/multi-btc-core-rpc

Build # 23663143763

Build Type

Pull #7053

github

Specific Base 3e8a3f

Committed by web-flow

Commit Message

Merge cecca4ac1 into 5636db408

Pull Request Pull Request #7053: Chore/fix 3.4 develop merge conflicts

Run Details

55 of 59 new or added lines in 8 files covered. (93.22%)

335 existing lines in 40 files now uncovered.

186426 of 217556 relevant lines covered (85.69%)

17048242.42 hits per line