refactor: separate governance from consensus code #7330
Annotations
2 errors and 3 warnings
|
Fail if conflicts exist
Process completed with exit code 1.
|
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7330,
conflictPrs: [
{
number: 6683,
files: [
'src/Makefile.bench.include',
'src/bench/streams_findbyte.cpp',
'src/net.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/streams.h',
'src/test/fuzz/buffered_file.cpp',
'src/test/streams_tests.cpp',
'src/validation.cpp',
'src/wallet/rpcdump.cpp',
'test/functional/wallet_importmulti.py'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6713,
files: [
'src/interfaces/wallet.h',
'src/qt/walletcontroller.cpp',
'src/wallet/interfaces.cpp',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'test/functional/p2p_invalid_messages.py',
'test/functional/p2p_leak_tx.py'
],
conflicts: [ 'src/wallet/interfaces.cpp' ]
},
{
number: 5943,
files: [
'src/Makefile.am',
'src/Makefile.test.include',
'src/governance/governance.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/signing.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/protocol.h',
'src/spork.cpp',
'src/spork.h',
'src/test/fuzz/txrequest.cpp',
'src/test/txrequest_tests.cpp',
'src/txrequest.cpp',
'src/txrequest.h',
'test/functional/p2p_tx_download.py'
],
conflicts: [
'src/Makefile.am',
'src/governance/governance.cpp',
'src/net_processing.cpp',
'src/net_processing.h'
]
},
{
number: 6182,
files: [
'src/governance/common.cpp',
'src/governance/common.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/interfaces/node.h',
'src/rpc/governance.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/interface_zmq_dash.py',
'test/functional/test_framework/governance.py',
'test/functional/test_framework/messages.py'
],
conflicts: [
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/rpc/governance.cpp',
'test/functional/feature_governance_cl.py'
]
},
{
number: 7037,
files: [
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/wallet.cpp',
'src/wallet/salvage.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_notifications.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_hd.py',
'test/functional/wallet_upgradetohd.py'
],
conflicts: [ 'src/init.cpp' ]
},
{
number: 6904,
files: [
'ci/dash/lint-tidy.sh',
'doc/REST-interface.md',
'doc/release-notes-6888.md',
'src/Makefile.am',
'src/bench/duplicate_inputs.cpp',
'src/bitcoind.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/coinjoin/client.cpp',
'src/deploymentstatus.cpp',
'src/deploymentstatus.h',
'src/evo/creditpool.cpp',
'src/evo/creditpool.h',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnhftx.cpp',
'src/evo/mnhftx.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/smldiff.cpp',
'src/e
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
Loading