From 89926e6b5fa8a5c99873eb277932458afa7a691e Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Sun, 13 Dec 2020 00:19:05 +0000 Subject: [PATCH] ci: correct bitcoin-node to elements-node for multiprocess CI job Also rename libbitcoin_consensus to libelements_consensus more consistently in src/Makefile.am. I'm not sure this was causing any problems but it did make it harder to follow what autotools is thinking. --- ci/test/00_setup_env_native_multiprocess.sh | 2 +- src/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh index 522a5d9fc2..754ee894d4 100644 --- a/ci/test/00_setup_env_native_multiprocess.sh +++ b/ci/test/00_setup_env_native_multiprocess.sh @@ -12,4 +12,4 @@ export PACKAGES="cmake python3" export DEP_OPTS="MULTIPROCESS=1" export GOAL="install" export BITCOIN_CONFIG="--with-boost-process" -export TEST_RUNNER_ENV="BITCOIND=bitcoin-node" +export TEST_RUNNER_ENV="BITCOIND=elements-node" diff --git a/src/Makefile.am b/src/Makefile.am index ffac383131..1021081212 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a LIBBITCOIN_COMMON=libbitcoin_common.a -LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a +LIBBITCOIN_CONSENSUS=libelements_consensus.a LIBBITCOIN_CLI=libbitcoin_cli.a LIBBITCOIN_UTIL=libbitcoin_util.a LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a @@ -465,9 +465,9 @@ crypto_libbitcoin_crypto_shani_a_CPPFLAGS += -DENABLE_SHANI crypto_libbitcoin_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp # consensus: shared between all executables that validate any consensus rules. -libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_consensus_a_SOURCES = \ +libelements_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libelements_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libelements_consensus_a_SOURCES = \ amount.h \ arith_uint256.cpp \ arith_uint256.h \ @@ -707,7 +707,7 @@ endif # bitcoinconsensus library # if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h -libelementsconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) +libelementsconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libelements_consensus_a_SOURCES) if GLIBC_BACK_COMPAT libelementsconsensus_la_SOURCES += compat/glibc_compat.cpp