Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

use existing donation_address instead

Browse source
This commit is contained in:
Victor Shyba 2019-09-17 01:40:26 -03:00 committed by Lex Berezhny
parent 64eaa5e3aa
commit ef94c1eccc
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
torba/tests/client_tests/integration/test_network.py
View file

@ -30,7 +30,7 @@ class NetworkTests(IntegrationTestCase):
'server_version': '0.5.7'}, await self.ledger.network.get_server_features()) 'server_version': '0.5.7'}, await self.ledger.network.get_server_features())
await self.conductor.spv_node.stop() await self.conductor.spv_node.stop()
address = (await self.account.get_addresses(limit=1))[0] address = (await self.account.get_addresses(limit=1))[0]
os.environ.update({'DESCRIPTION': 'Fastest server in the west.', 'PAYMENT_ADDRESS': address, 'DAILY_FEE': '42'}) os.environ.update({'DESCRIPTION': 'Fastest server in the west.', 'DONATION_ADDRESS': address, 'DAILY_FEE': '42'})
await self.conductor.spv_node.start(self.conductor.blockchain_node) await self.conductor.spv_node.start(self.conductor.blockchain_node)
await self.ledger.network.on_connected.first await self.ledger.network.on_connected.first
self.assertEqual({'genesis_hash': self.conductor.spv_node.coin_class.GENESIS_HASH, self.assertEqual({'genesis_hash': self.conductor.spv_node.coin_class.GENESIS_HASH,

1
torba/torba/server/env.py
View file

@ -81,7 +81,6 @@ class Env:
self.session_timeout = self.integer('SESSION_TIMEOUT', 600) self.session_timeout = self.integer('SESSION_TIMEOUT', 600)
self.drop_client = self.custom("DROP_CLIENT", None, re.compile) self.drop_client = self.custom("DROP_CLIENT", None, re.compile)
self.description = self.default('DESCRIPTION', '') self.description = self.default('DESCRIPTION', '')
self.payment_address = self.default('PAYMENT_ADDRESS', '')
self.daily_fee = self.integer('DAILY_FEE', 0) self.daily_fee = self.integer('DAILY_FEE', 0)
# Identities # Identities

2
torba/torba/server/session.py
View file

@ -768,7 +768,7 @@ class ElectrumX(SessionBase):
'protocol_max': max_str, 'protocol_max': max_str,
'genesis_hash': env.coin.GENESIS_HASH, 'genesis_hash': env.coin.GENESIS_HASH,
'description': env.description, 'description': env.description,
'payment_address': env.payment_address, 'payment_address': env.donation_address,
'daily_fee': env.daily_fee, 'daily_fee': env.daily_fee,
'hash_function': 'sha256', 'hash_function': 'sha256',
} }