diff --git a/basicswap/db.py b/basicswap/db.py index 2f9df62..bb583f2 100644 --- a/basicswap/db.py +++ b/basicswap/db.py @@ -14,7 +14,7 @@ from typing import Optional CURRENT_DB_VERSION = 26 -CURRENT_DB_DATA_VERSION = 5 +CURRENT_DB_DATA_VERSION = 6 class Concepts(IntEnum): diff --git a/basicswap/db_upgrades.py b/basicswap/db_upgrades.py index f6a3b4a..5208d0f 100644 --- a/basicswap/db_upgrades.py +++ b/basicswap/db_upgrades.py @@ -104,17 +104,19 @@ def upgradeDatabaseData(self, data_version): ), cursor, ) - if data_version > 0 and data_version < 3: + if data_version > 0 and data_version < 6: for state in BidStates: in_error = isErrorBidState(state) swap_failed = isFailingBidState(state) swap_ended = isFinalBidState(state) + can_accept = canAcceptBidState(state) cursor.execute( - "UPDATE bidstates SET in_error = :in_error, swap_failed = :swap_failed, swap_ended = :swap_ended WHERE state_id = :state_id", + "UPDATE bidstates SET can_accept = :can_accept, in_error = :in_error, swap_failed = :swap_failed, swap_ended = :swap_ended WHERE state_id = :state_id", { "in_error": in_error, "swap_failed": swap_failed, "swap_ended": swap_ended, + "can_accept": can_accept, "state_id": int(state), }, ) diff --git a/tests/basicswap/extended/test_wallet_restore.py b/tests/basicswap/extended/test_wallet_restore.py index af507bb..bf2a0af 100644 --- a/tests/basicswap/extended/test_wallet_restore.py +++ b/tests/basicswap/extended/test_wallet_restore.py @@ -10,7 +10,7 @@ export TEST_PATH=/tmp/test_basicswap_wallet_restore mkdir -p ${TEST_PATH}/bin cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin -export PGP_KEYS_DIR_PATH=$(pwd)/pgp/keys +export PGP_KEYS_DIR_PATH=$(pwd)/basicswap/pgp/keys export PYTHONPATH=$(pwd) python tests/basicswap/extended/test_wallet_restore.py