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

Refactor participate_tx

Browse Source
This commit is contained in:
tecnovert
2019-07-27 21:50:50 +02:00
parent 4a07c891f6
commit 7ccf191192
7 changed files with 100 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
basicswap/db.py
View File

@@ -7,7 +7,6 @@
import struct
import time
import sqlalchemy as sa
from sqlalchemy.orm import sessionmaker, scoped_session
from sqlalchemy.ext.declarative import declarative_base
CURRENT_DB_VERSION = 1
@@ -89,22 +88,12 @@ class Bid(Base):
accept_msg_id = sa.Column(sa.LargeBinary)
pkhash_seller = sa.Column(sa.LargeBinary)
initiate_txn_redeem = sa.Column(sa.LargeBinary)
initiate_txn_refund = sa.Column(sa.LargeBinary)
participate_script = sa.Column(sa.LargeBinary)
participate_txid = sa.Column(sa.LargeBinary)
participate_txn_n = sa.Column(sa.Integer)
participate_txn_conf = sa.Column(sa.Integer)
participate_txn_redeem = sa.Column(sa.LargeBinary)
participate_txn_refund = sa.Column(sa.LargeBinary)
participate_spend_txid = sa.Column(sa.LargeBinary)
participate_spend_n = sa.Column(sa.Integer)
participate_txn_height = sa.Column(sa.Integer)
participate_txn_state = sa.Column(sa.Integer)
participate_txn_states = sa.Column(sa.LargeBinary) # Packed states and times
state = sa.Column(sa.Integer)
state_time = sa.Column(sa.BigInteger) # timestamp of last state change
states = sa.Column(sa.LargeBinary) # Packed states and times
@@ -134,12 +123,6 @@ class Bid(Base):
self.participate_tx.state = new_state
self.participate_tx.states = (self.participate_tx.states if self.participate_tx.states is not None else bytes()) + struct.pack('<iq', new_state, int(time.time()))
self.participate_txn_state = new_state
if self.participate_txn_states is None:
self.participate_txn_states = struct.pack('<iq', new_state, int(time.time()))
else:
self.participate_txn_states += struct.pack('<iq', new_state, int(time.time()))
def setState(self, new_state):
now = int(time.time())
self.state = new_state
@@ -190,4 +173,3 @@ class SentOffer(Base):
__tablename__ = 'sentoffers'
offer_id = sa.Column(sa.LargeBinary, primary_key=True)