AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: TxMinedInfo (merged TxMinedStatus and VerifiedTxInfo)

Browse Source
This commit is contained in:
SomberNight
2018-12-07 20:47:28 +01:00
parent e1f4865844
commit c017f788ac
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/tests/test_wallet.py
View File

@@ -11,7 +11,7 @@ from io import StringIO
from electrum.storage import WalletStorage, FINAL_SEED_VERSION
from electrum.wallet import Abstract_Wallet
from electrum.exchange_rate import ExchangeBase, FxThread
from electrum.util import TxMinedStatus
from electrum.util import TxMinedInfo
from electrum.bitcoin import COIN
from . import SequentialTestCase
@@ -99,7 +99,7 @@ class FakeWallet:
def get_tx_height(self, txid):
# because we use a current timestamp, and history is empty,
# FxThread.history_rate will use spot prices
return TxMinedStatus(height=10, conf=10, timestamp=time.time(), header_hash='def')
return TxMinedInfo(height=10, conf=10, timestamp=int(time.time()), header_hash='def')
default_fiat_value = Abstract_Wallet.default_fiat_value
price_at_timestamp = Abstract_Wallet.price_at_timestamp