Skip to content

Commit

Permalink
Revert "Spark integration (#1246)"
Browse files Browse the repository at this point in the history
This reverts commit 0579884.
  • Loading branch information
reubenyap authored Nov 21, 2023
1 parent 7154f7f commit 3e9be5a
Show file tree
Hide file tree
Showing 222 changed files with 991 additions and 20,599 deletions.
30 changes: 5 additions & 25 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 14)
define(_CLIENT_VERSION_REVISION, 12)
define(_CLIENT_VERSION_BUILD, 6)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down Expand Up @@ -92,18 +92,7 @@ AC_PATH_TOOL(OBJCOPY, objcopy)
AC_ARG_VAR(PYTHONPATH, Augments the default search path for python module files)

# Enable wallet
AC_ARG_ENABLE([wallet],
[AS_HELP_STRING([--disable-wallet],
[disable wallet (enabled by default)])],
[enable_wallet=$enableval],
[enable_wallet=yes])

AC_ARG_WITH([bdb],
[AS_HELP_STRING([--without-bdb],
[disable bdb wallet support (default is enabled if wallet is enabled)])],
[use_bdb=$withval],
[use_bdb=auto])

enable_wallet=yes

AC_ARG_ENABLE([elysium],
[AS_HELP_STRING([--enable-elysium],[enable elysium (disabled by default)])],
Expand Down Expand Up @@ -662,11 +651,9 @@ AC_SUBST(LEVELDB_CPPFLAGS)
AC_SUBST(LIBLEVELDB)
AC_SUBST(LIBMEMENV)

if test "$enable_wallet" != "no"; then
dnl Check for libdb_cxx only if wallet enabled
if test "$use_bdb" != "no"; then
BITCOIN_FIND_BDB48
fi
if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled
BITCOIN_FIND_BDB48
fi

dnl Check for libminiupnpc (optional)
Expand Down Expand Up @@ -1181,7 +1168,6 @@ AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
AM_CONDITIONAL([USE_BDB], [test "$use_bdb" = "yes"])

AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
Expand Down Expand Up @@ -1236,7 +1222,6 @@ AC_SUBST(ZMQ_LIBS)
AC_SUBST(PROTOBUF_LIBS)
AC_SUBST(QR_LIBS)
AC_SUBST(DSYMUTIL_FLAT)
AC_SUBST(USE_BDB)
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
Expand Down Expand Up @@ -1306,11 +1291,6 @@ if test x$bitcoin_enable_qt != xno; then
echo " qt version = $bitcoin_qt_got_major_vers"
echo " with qr = $use_qr"
fi

if test "$enable_wallet" != "no"; then
echo " with bdb = $use_bdb"
fi

echo " with zmq = $use_zmq"
echo " with test = $use_tests"
echo " with bench = $use_bench"
Expand Down
3 changes: 0 additions & 3 deletions qa/pull-tester/rpc-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@
raise

testScripts = [
'spark_mint.py',
'spark_spend_gettransaction.py',
'spark_setmintstatus_validation.py',
'lelantus_mint.py',
'lelantus_setmintstatus_validation.py',
'lelantus_mintspend.py',
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/bip47-sendreceive.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def setup_network(self, split=False):

def run_test(self):

self.nodes[1].generate(410)
self.nodes[1].generate(1010)
node0_pcode = self.nodes[0].createrapaddress("node0-pcode0")

try:
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/lelantus_mint.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def run_test(self):

assert_raises_message(
JSONRPCException,
"Lelantus is not active",
"Lelantus is not activated yet",
self.nodes[0].mintlelantus, 1)

self.nodes[0].generate(activation_block - self.nodes[0].getblockcount())
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/lelantus_mintspend.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self):
def run_test(self):
# Decimal formating: 6 digits for balance will be enought 000.000
getcontext().prec = 6
self.nodes[0].generate(201)
self.nodes[0].generate(401)
self.sync_all()

start_bal = self.nodes[0].getbalance()
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/llmq-cl-evospork.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def run_test(self):
self.nodes[0].sendtoaddress(self.payment_address, 1)

# mine many blocks, wait for chainlock
while self.nodes[0].getblockcount() < 800:
while self.nodes[0].getblockcount() < 1000:
self.nodes[0].generate(20)
self.wait_for_chainlock_tip_all_nodes()

Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/llmq-is-lelantus.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def run_test(self):
self.mine_quorum()
self.wait_for_chainlocked_block_all_nodes(self.nodes[0].getbestblockhash())

self.nodes[0].generate(401 - self.nodes[0].getblockcount())
self.nodes[0].generate(1000 - self.nodes[0].getblockcount())
for i in range(0, 3):
mintTxids = self.nodes[0].mintlelantus(1)

Expand Down
58 changes: 0 additions & 58 deletions qa/rpc-tests/llmq-is-spark.py

This file was deleted.

83 changes: 0 additions & 83 deletions qa/rpc-tests/spark_mint.py

This file was deleted.

123 changes: 0 additions & 123 deletions qa/rpc-tests/spark_mintspend.py

This file was deleted.

Loading

0 comments on commit 3e9be5a

Please sign in to comment.