diff --git a/lbry/wallet/ledger.py b/lbry/wallet/ledger.py index 57e3ab0db..2ecd81bd5 100644 --- a/lbry/wallet/ledger.py +++ b/lbry/wallet/ledger.py @@ -106,7 +106,7 @@ class Ledger(metaclass=LedgerRegistry): target_timespan = 150 default_fee_per_byte = 50 - default_fee_per_name_char = 200000 + default_fee_per_name_char = 0 checkpoints = HASHES diff --git a/lbry/wallet/orchstr8/node.py b/lbry/wallet/orchstr8/node.py index 640a74cfb..9606c0a37 100644 --- a/lbry/wallet/orchstr8/node.py +++ b/lbry/wallet/orchstr8/node.py @@ -189,6 +189,7 @@ class WalletNode: 'known_hubs': config.known_hubs if config else KnownHubsList(), 'hub_timeout': 30, 'concurrent_hub_requests': 32, + 'fee_per_name_char': 200000 } }, 'wallets': [wallet_file_name] diff --git a/tests/integration/blockchain/test_network.py b/tests/integration/blockchain/test_network.py index 0b9fcac68..230110596 100644 --- a/tests/integration/blockchain/test_network.py +++ b/tests/integration/blockchain/test_network.py @@ -3,9 +3,10 @@ import scribe from unittest.mock import Mock -from scribe.blockchain.network import LBCRegTest +from scribe.hub import HUB_PROTOCOL_VERSION from scribe.hub.udp import StatusServer from scribe.hub.session import LBRYElectrumX +from scribe.blockchain.network import LBCRegTest from lbry.wallet.network import Network from lbry.wallet.orchstr8 import Conductor @@ -35,7 +36,7 @@ class NetworkTests(IntegrationTestCase): 'payment_address': '', 'donation_address': '', 'daily_fee': '0', - 'server_version': scribe.__version__, + 'server_version': HUB_PROTOCOL_VERSION, 'trending_algorithm': 'fast_ar', }, await self.ledger.network.get_server_features()) # await self.conductor.spv_node.stop() @@ -65,7 +66,7 @@ class NetworkTests(IntegrationTestCase): 'payment_address': payment_address, 'donation_address': donation_address, 'daily_fee': '42', - 'server_version': scribe.__version__, + 'server_version': HUB_PROTOCOL_VERSION, 'trending_algorithm': 'fast_ar', }, await self.ledger.network.get_server_features()) diff --git a/tests/integration/blockchain/test_wallet_server_sessions.py b/tests/integration/blockchain/test_wallet_server_sessions.py index 70e2535d9..d09c398f7 100644 --- a/tests/integration/blockchain/test_wallet_server_sessions.py +++ b/tests/integration/blockchain/test_wallet_server_sessions.py @@ -1,6 +1,6 @@ import asyncio -import scribe +from scribe.hub import HUB_PROTOCOL_VERSION from scribe.hub.session import LBRYElectrumX from lbry.error import ServerPaymentFeeAboveMaxAllowedError @@ -34,7 +34,7 @@ class TestSessions(IntegrationTestCase): async def test_proper_version(self): info = await self.ledger.network.get_server_features() - self.assertEqual(scribe.__version__, info['server_version']) + self.assertEqual(HUB_PROTOCOL_VERSION, info['server_version']) async def test_client_errors(self): # Goal is ensuring thsoe are raised and not trapped accidentally diff --git a/tests/integration/transactions/test_transaction_commands.py b/tests/integration/transactions/test_transaction_commands.py index 8252d4bb1..4b478af04 100644 --- a/tests/integration/transactions/test_transaction_commands.py +++ b/tests/integration/transactions/test_transaction_commands.py @@ -1,3 +1,4 @@ +import asyncio import unittest from lbry.testcase import CommandTestCase @@ -28,6 +29,7 @@ class TransactionCommandsTestCase(CommandTestCase): # someone's tx change_address = await self.blockchain.get_raw_change_address() sendtxid = await self.blockchain.send_to_address(change_address, 10) + await asyncio.sleep(0.2) tx = await self.daemon.jsonrpc_transaction_show(sendtxid) self.assertEqual(tx.id, sendtxid) self.assertEqual(tx.height, -1) diff --git a/tests/unit/wallet/test_transaction.py b/tests/unit/wallet/test_transaction.py index 509c09ba7..b12acc645 100644 --- a/tests/unit/wallet/test_transaction.py +++ b/tests/unit/wallet/test_transaction.py @@ -42,7 +42,8 @@ class TestSizeAndFeeEstimation(AsyncioTestCase): async def asyncSetUp(self): self.ledger = Ledger({ 'db': Database(':memory:'), - 'headers': Headers(':memory:') + 'headers': Headers(':memory:'), + 'fee_per_name_char': 200_000 }) await self.ledger.db.open()