midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 18:38:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix can_accept for upgraded dbs.

Browse Source
This commit is contained in:
tecnovert
2025-03-18 20:43:00 +02:00
parent 5270c7da0b
commit 03a8ddc863
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basicswap/db.py
View File

@@ -14,7 +14,7 @@ from typing import Optional
CURRENT_DB_VERSION = 26 CURRENT_DB_VERSION = 26
CURRENT_DB_DATA_VERSION = 5 CURRENT_DB_DATA_VERSION = 6
class Concepts(IntEnum): class Concepts(IntEnum):

6
basicswap/db_upgrades.py
View File

@@ -104,17 +104,19 @@ def upgradeDatabaseData(self, data_version):
), ),
cursor, cursor,
) )
if data_version > 0 and data_version < 3: if data_version > 0 and data_version < 6:
for state in BidStates: for state in BidStates:
in_error = isErrorBidState(state) in_error = isErrorBidState(state)
swap_failed = isFailingBidState(state) swap_failed = isFailingBidState(state)
swap_ended = isFinalBidState(state) swap_ended = isFinalBidState(state)
can_accept = canAcceptBidState(state)
cursor.execute( 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, "in_error": in_error,
"swap_failed": swap_failed, "swap_failed": swap_failed,
"swap_ended": swap_ended, "swap_ended": swap_ended,
"can_accept": can_accept,
"state_id": int(state), "state_id": int(state),
}, },
) )

2
tests/basicswap/extended/test_wallet_restore.py
View File

@@ -10,7 +10,7 @@
export TEST_PATH=/tmp/test_basicswap_wallet_restore export TEST_PATH=/tmp/test_basicswap_wallet_restore
mkdir -p ${TEST_PATH}/bin mkdir -p ${TEST_PATH}/bin
cp -r ~/tmp/basicswap_bin/* ${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) export PYTHONPATH=$(pwd)
python tests/basicswap/extended/test_wallet_restore.py python tests/basicswap/extended/test_wallet_restore.py