Refactor transaction creation.

firoorg · Nov 13, 2023 · dd93e7e · dd93e7e
1 parent 92a3d42
commit dd93e7e
Show file tree

Hide file tree

Showing 27 changed files with 2,137 additions and 2,420 deletions.
diff --git a/src/Makefile.elysiumtest.include b/src/Makefile.elysiumtest.include
@@ -38,15 +38,6 @@ ELYSIUM_TEST_CPP = \
   elysium/test/uint256_extensions_tests.cpp \
   elysium/test/utils_tx.cpp
 
-if ENABLE_WALLET
-ELYSIUM_TEST_CPP += \
-  elysium/test/sigmawallet_tests.cpp \
-  elysium/test/sigmawalletv0_tests.cpp \
-  elysium/test/sigmawalletv1_tests.cpp \
-  elysium/test/wallet_tests.cpp \
-  elysium/test/walletmodels_tests.cpp
-endif
-
 BITCOIN_TESTS += \
   $(ELYSIUM_TEST_CPP) \
   $(ELYSIUM_TEST_H)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -192,7 +192,8 @@ BITCOIN_TESTS += \
   wallet/test/lelantus_tests.cpp \
   wallet/test/sigma_tests.cpp \
   wallet/test/mnemonic_tests.cpp \
-  wallet/test/txbuilder_tests.cpp
+  wallet/test/sigmatxbuilder_tests.cpp \
+  wallet/test/createtransaction_tests.cpp
 endif
 
 test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) -ltor

diff --git a/src/elysium/elysium.cpp b/src/elysium/elysium.cpp
@@ -2291,7 +2291,7 @@ int elysium::WalletTxBuilder(
     switch (inputMode) {
     case InputMode::NORMAL:
         // Ask the wallet to create the transaction (note mining fee determined by Bitcoin Core params)
-        if (!pwalletMain->CreateTransaction(vecRecipients, wtxNew, reserveKey, nFeeRet, nChangePosInOut, strFailReason, &coinControl)) {
+        if (!pwalletMain->CreateTransaction(vecRecipients, wtxNew, &reserveKey, nFeeRet, nChangePosInOut, strFailReason, &coinControl)) {
             PrintToLog("%s: ERROR: wallet transaction creation failed: %s\n", __func__, strFailReason);
             return MP_ERR_CREATE_TX;
         }