Skip to content

Commit

Permalink
Remove elysium code (firoorg#1367)
Browse files Browse the repository at this point in the history
* Remove elysium code

* More cleanup

* Make spark_state_test stable

---------

Co-authored-by: levonpetrosyan93 <[email protected]>
  • Loading branch information
levoncrypto and levonpetrosyan93 authored Dec 20, 2023
1 parent 78e7d1e commit 74d6049
Show file tree
Hide file tree
Showing 239 changed files with 17 additions and 52,442 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Firo
run: |
./configure --disable-jni --enable-elysium --enable-tests --with-comparison-tool=no --prefix=$(realpath depends/x86_64-pc-linux-gnu)
./configure --disable-jni --enable-tests --with-comparison-tool=no --prefix=$(realpath depends/x86_64-pc-linux-gnu)
make -j$(nproc)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Run Unit Tests
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Firo
run: |
./configure --without-libs --disable-jni --enable-elysium --prefix=$(realpath depends/x86_64-w64-mingw32)
./configure --without-libs --disable-jni --prefix=$(realpath depends/x86_64-w64-mingw32)
make -j$(nproc)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Prepare Files for Artifact
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Firo
run: |
./configure --disable-jni --enable-elysium --prefix=$(grealpath depends/x86_64-apple-darwin*)
./configure --disable-jni --prefix=$(grealpath depends/x86_64-apple-darwin*)
make -j$(sysctl -n hw.activecpu)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Prepare Files for Artifact
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pipeline {
sh 'mkdir -p dist'
sh 'tar -C dist --strip-components=1 -xzf firo-*.tar.gz'
dir('dist') {
sh './configure --prefix=`pwd`/../depends/x86_64-linux-gnu --enable-elysium --enable-tests --enable-crash-hooks'
sh './configure --prefix=`pwd`/../depends/x86_64-linux-gnu --enable-tests --enable-crash-hooks'
sh 'make -j`nproc`'
}
}
Expand Down
18 changes: 1 addition & 17 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ AC_ARG_WITH([bdb],
[use_bdb=$withval],
[use_bdb=auto])


AC_ARG_ENABLE([elysium],
[AS_HELP_STRING([--enable-elysium],[enable elysium (disabled by default)])],
[enable_elysium=$enableval],
[enable_elysium=no])

AC_ARG_WITH([miniupnpc],
[AS_HELP_STRING([--with-miniupnpc],
[enable UPNP (default is yes if libminiupnpc is found)])],
Expand Down Expand Up @@ -1053,15 +1047,6 @@ else
AC_MSG_RESULT(no)
fi

dnl enable elysium
AC_MSG_CHECKING([if elysium should be enabled])
if test x$enable_elysium != xno; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED([ENABLE_ELYSIUM],[1],[Define if elysium should be compiled in])
else
AC_MSG_RESULT(no)
fi

dnl enable upnp support
AC_MSG_CHECKING([whether to build with support for UPnP])
if test x$have_miniupnpc = xno; then
Expand Down Expand Up @@ -1171,7 +1156,6 @@ AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
AM_CONDITIONAL([ENABLE_ELYSIUM],[test x$enable_elysium = xyes])
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes])
AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
Expand Down Expand Up @@ -1328,4 +1312,4 @@ echo " CPPFLAGS = $CPPFLAGS"
echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS"
echo " LDFLAGS = $LDFLAGS"
echo
echo
1 change: 0 additions & 1 deletion contrib/bitcoin-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ FORMS += \
../src/qt/forms/signverifymessagedialog.ui \
../src/qt/forms/transactiondescdialog.ui \
../src/qt/forms/zerocoinpage.ui \
../src/qt/forms/sendmpdialog.ui \
../src/qt/forms/sendcoinsdialog.ui \

RESOURCES += \
Expand Down
1 change: 0 additions & 1 deletion contrib/guix/libexec/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ mkdir -p "$DISTSRC"
--disable-ccache \
--disable-maintainer-mode \
--disable-dependency-tracking \
--enable-elysium \
--enable-crash-hooks \
--without-libs \
${CONFIGFLAGS} \
Expand Down
9 changes: 0 additions & 9 deletions qa/pull-tester/rpc-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,6 @@
'lelantus_setmintstatus_validation.py',
'lelantus_mintspend.py',
'lelantus_spend_gettransaction.py',
'elysium_create_denomination.py',
'elysium_property_creation_fee.py',
# 'elysium_sendmint.py',
'elysium_sendmint_wallet_encryption.py',
'elysium_sendspend.py',
'elysium_sendspend_wallet_encryption.py',
'elysium_sigma_reindex.py',
'elysium_sigma_reorg.py',
'elysium_walletrecovery.py',
'mempool_doublesend_oneblock.py',
'mempool_reorg.py',
'mempool_spendcoinbase.py',
Expand Down
117 changes: 0 additions & 117 deletions qa/rpc-tests/elysium_create_denomination.py

This file was deleted.

Loading

0 comments on commit 74d6049

Please sign in to comment.