зеркало из https://github.com/microsoft/CCF.git
Do not attempt to run BFT when disabled (#2968)
This commit is contained in:
Родитель
63f1d7c0d6
Коммит
9cb5a7ab26
|
@ -1 +1 @@
|
|||
Hey there, Delilah
|
||||
Bonsensus
|
|
@ -54,8 +54,10 @@ install(FILES ${CCF_DIR}/include/ccf/version.h DESTINATION include/ccf)
|
|||
|
||||
if(ENABLE_BFT)
|
||||
set(CONSENSUSES cft bft)
|
||||
set(CONSENSUS_FILTER all)
|
||||
else()
|
||||
set(CONSENSUSES cft)
|
||||
set(CONSENSUS_FILTER cft)
|
||||
endif()
|
||||
|
||||
option(BUILD_TESTS "Build tests" ON)
|
||||
|
@ -705,7 +707,7 @@ if(BUILD_TESTS)
|
|||
add_e2e_test(
|
||||
NAME election_test
|
||||
PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/election.py
|
||||
CONSENSUS cft
|
||||
CONSENSUS ${CONSENSUS_FILTER}
|
||||
)
|
||||
|
||||
foreach(CONSENSUS ${CONSENSUSES})
|
||||
|
|
|
@ -98,23 +98,25 @@ if __name__ == "__main__":
|
|||
|
||||
args = copy.deepcopy(cr.args)
|
||||
|
||||
args.consensus = "cft"
|
||||
cr.add(
|
||||
"cft",
|
||||
run,
|
||||
package="liblogging",
|
||||
nodes=infra.e2e_args.min_nodes(args, f=1),
|
||||
raft_election_timeout_ms=500,
|
||||
consensus="cft",
|
||||
)
|
||||
if cr.args.consensus in ("cft", "all"):
|
||||
args.consensus = "cft"
|
||||
cr.add(
|
||||
"cft",
|
||||
run,
|
||||
package="liblogging",
|
||||
nodes=infra.e2e_args.min_nodes(args, f=1),
|
||||
raft_election_timeout_ms=500,
|
||||
consensus="cft",
|
||||
)
|
||||
|
||||
args.consensus = "bft"
|
||||
cr.add(
|
||||
"bft",
|
||||
run,
|
||||
package="liblogging",
|
||||
nodes=infra.e2e_args.min_nodes(args, f=1),
|
||||
consensus="bft",
|
||||
)
|
||||
if cr.args.consensus in ("bft", "all"):
|
||||
args.consensus = "bft"
|
||||
cr.add(
|
||||
"bft",
|
||||
run,
|
||||
package="liblogging",
|
||||
nodes=infra.e2e_args.min_nodes(args, f=1),
|
||||
consensus="bft",
|
||||
)
|
||||
|
||||
cr.run()
|
||||
|
|
|
@ -217,7 +217,7 @@ def cli_args(add=lambda x: None, parser=None, accept_unknown=False):
|
|||
"--consensus",
|
||||
help="Consensus",
|
||||
default="cft",
|
||||
choices=("cft", "bft"),
|
||||
choices=("cft", "bft", "all"),
|
||||
)
|
||||
parser.add_argument(
|
||||
"--worker-threads",
|
||||
|
|
Загрузка…
Ссылка в новой задаче