AaronFiore/electrum
1
0
Fork 0
Code Activity

Use attr.s instead of namedtuples for channel config

Browse Source
This commit is contained in:
ThomasV
2020-01-30 18:09:32 +01:00
parent 9bd633fb0b
commit 757467782a
7 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
electrum/tests/test_lnchannel.py
View File

@@ -45,7 +45,6 @@ def create_channel_state(funding_txid, funding_index, funding_sat, is_initiator,
assert local_amount > 0
assert remote_amount > 0
channel_id, _ = lnpeer.channel_id_from_funding_tx(funding_txid, funding_index)
their_revocation_store = lnpeer.RevocationStore()
return {
"channel_id":channel_id,
@@ -67,7 +66,6 @@ def create_channel_state(funding_txid, funding_index, funding_sat, is_initiator,
next_per_commitment_point=nex,
current_per_commitment_point=cur,
revocation_store=their_revocation_store,
),
"local_config":lnpeer.LocalConfig(
payment_basepoint=privkeys[0],
@@ -96,6 +94,7 @@ def create_channel_state(funding_txid, funding_index, funding_sat, is_initiator,
"node_id":other_node_id,
'onion_keys': {},
'state': 'PREOPENING',
'revocation_store': {},
}
def bip32(sequence):
@@ -151,14 +150,16 @@ def create_test_channels(feerate=6000, local=None, remote=None):
assert len(a_htlc_sigs) == 0
assert len(b_htlc_sigs) == 0
alice.config[LOCAL] = alice.config[LOCAL]._replace(current_commitment_signature=sig_from_bob)
bob.config[LOCAL] = bob.config[LOCAL]._replace(current_commitment_signature=sig_from_alice)
alice.config[LOCAL].current_commitment_signature = sig_from_bob
bob.config[LOCAL].current_commitment_signature = sig_from_alice
alice_second = lnutil.secret_to_pubkey(int.from_bytes(lnutil.get_per_commitment_secret_from_seed(alice_seed, lnutil.RevocationStore.START_INDEX - 1), "big"))
bob_second = lnutil.secret_to_pubkey(int.from_bytes(lnutil.get_per_commitment_secret_from_seed(bob_seed, lnutil.RevocationStore.START_INDEX - 1), "big"))
alice.config[REMOTE] = alice.config[REMOTE]._replace(next_per_commitment_point=bob_second, current_per_commitment_point=bob_first)
bob.config[REMOTE] = bob.config[REMOTE]._replace(next_per_commitment_point=alice_second, current_per_commitment_point=alice_first)
alice.config[REMOTE].next_per_commitment_point = bob_second
alice.config[REMOTE].current_per_commitment_point = bob_first
bob.config[REMOTE].next_per_commitment_point = alice_second
bob.config[REMOTE].current_per_commitment_point = alice_first
alice.hm.channel_open_finished()
bob.hm.channel_open_finished()
@@ -663,15 +664,11 @@ class TestChanReserve(ElectrumTestCase):
bob_min_reserve = 6 * one_bitcoin_in_msat // 1000
# bob min reserve was decided by alice, but applies to bob
alice_channel.config[LOCAL] =\
alice_channel.config[LOCAL]._replace(reserve_sat=bob_min_reserve)
alice_channel.config[REMOTE] =\
alice_channel.config[REMOTE]._replace(reserve_sat=alice_min_reserve)
alice_channel.config[LOCAL].reserve_sat = bob_min_reserve
alice_channel.config[REMOTE].reserve_sat = alice_min_reserve
bob_channel.config[LOCAL] =\
bob_channel.config[LOCAL]._replace(reserve_sat=alice_min_reserve)
bob_channel.config[REMOTE] =\
bob_channel.config[REMOTE]._replace(reserve_sat=bob_min_reserve)
bob_channel.config[LOCAL].reserve_sat = alice_min_reserve
bob_channel.config[REMOTE].reserve_sat = bob_min_reserve
self.alice_channel = alice_channel
self.bob_channel = bob_channel

6
electrum/tests/test_lnutil.py
View File

@@ -422,7 +422,7 @@ class TestLNUtil(ElectrumTestCase):
]
for test in tests:
receiver = RevocationStore()
receiver = RevocationStore({})
for insert in test["inserts"]:
secret = bytes.fromhex(insert["secret"])
@@ -445,14 +445,14 @@ class TestLNUtil(ElectrumTestCase):
def test_shachain_produce_consume(self):
seed = bitcoin.sha256(b"shachaintest")
consumer = RevocationStore()
consumer = RevocationStore({})
for i in range(10000):
secret = get_per_commitment_secret_from_seed(seed, RevocationStore.START_INDEX - i)
try:
consumer.add_next_entry(secret)
except Exception as e:
raise Exception("iteration " + str(i) + ": " + str(e))
if i % 1000 == 0: self.assertEqual(consumer.serialize(), RevocationStore.from_json_obj(json.loads(json.dumps(consumer.serialize()))).serialize())
if i % 1000 == 0: self.assertEqual(consumer.serialize(), RevocationStore(json.loads(json.dumps(consumer.serialize()))).serialize())
def test_commitment_tx_with_all_five_HTLCs_untrimmed_minimum_feerate(self):
to_local_msat = 6988000000