Skip to content

refactor: move CConnman::RelayInv{Filtered} to PeerManager, remove CConnman::RelayTransaction #12335

refactor: move CConnman::RelayInv{Filtered} to PeerManager, remove CConnman::RelayTransaction

refactor: move CConnman::RelayInv{Filtered} to PeerManager, remove CConnman::RelayTransaction #12335

Triggered via pull request April 23, 2024 15:14
@kwvgkwvg
synchronize #5977
Status Failure
Total duration 54s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
main
Process completed with exit code 1.
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5977, conflictPrs: [ { number: 4321, files: [ 'src/Makefile.am', 'src/bls/bls.cpp', 'src/bls/bls.h', 'src/chainparams.cpp', 'src/chainparams.h', 'src/coinjoin/coinjoin-client.cpp', 'src/coinjoin/coinjoin-util.h', 'src/compressor.cpp', 'src/evo/simplifiedmns.cpp', 'src/interfaces/wallet.cpp', 'src/interfaces/wallet.h', 'src/key_io.cpp', 'src/key_io.h', 'src/keystore.cpp', 'src/keystore.h', 'src/rpc/governance.cpp', 'src/rpc/rpcevo.cpp', 'src/rpc/util.cpp', 'src/rpc/util.h', 'src/script/descriptor.cpp', 'src/script/interpreter.cpp', 'src/script/script.cpp', 'src/script/script.h', 'src/script/standard.cpp', 'src/script/standard.h', 'src/test/data/script_tests.json', 'src/test/test_dash.h', 'src/wallet/coincontrol.h', 'src/wallet/keypool.cpp', 'src/wallet/keypool.h', 'src/wallet/rpcwallet.cpp', 'src/wallet/test/coinjoin_tests.cpp', 'src/wallet/test/wallet_tests.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'test/lint/lint-circular-dependencies.sh' ], conflicts: [ 'src/rpc/governance.cpp', 'test/lint/lint-circular-dependencies.sh' ] }, { number: 4465, files: [ 'src/governance/classes.h', 'src/governance/governance.cpp', 'src/governance/governance.h', 'src/governance/object.cpp', 'src/governance/object.h' ], conflicts: [ 'src/governance/governance.cpp', 'src/governance/governance.h', 'src/governance/object.cpp', 'src/governance/object.h' ] }, { number: 4472, files: [ 'src/coinjoin/client.cpp', 'src/coinjoin/client.h', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/deterministicmns.cpp', 'src/evo/deterministicmns.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/llmq/blockprocessor.cpp', 'src/llmq/blockprocessor.h', 'src/llmq/chainlocks.cpp', 'src/llmq/chainlocks.h', 'src/llmq/debug.cpp', 'src/llmq/debug.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing_shares.h', 'src/llmq/utils.cpp', 'src/masternode/meta.cpp', 'src/masternode/payments.cpp', 'src/masternode/payments.h', 'src/masternode/utils.cpp', 'src/miner.cpp', 'src/net_processing.cpp', 'src/rpc/masternode.cpp', 'src/rpc/rpcevo.cpp', 'src/rpc/rpcquorums.cpp', 'src/spork.cpp', 'src/spork.h', 'src/test/setup_common.cpp', 'src/validation.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/llmq/blockprocessor.cpp', 'src/llmq/blockprocessor.h', 'src/llmq/chainlocks.cpp', 'src/llmq/chainlocks.h', 'src/net_processing.cpp', 'src/spork.cpp', 'src/spork.h' ] }, { number: 4631, files: [ 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/commitment.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 's
main
Potential conflicts detected!