From f7d2a33d4581a93f862df34daad1e6f1f076af72 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 22 Mar 2021 17:03:50 +0100 Subject: [PATCH] set initial trampoline fee level to 1 unless we are testing --- electrum/lnworker.py | 4 +++- electrum/tests/test_lnpeer.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/electrum/lnworker.py b/electrum/lnworker.py index 3d9ac5ce3..547b3f294 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -185,6 +185,8 @@ LNGOSSIP_FEATURES = BASE_FEATURES\ class LNWorker(Logger, NetworkRetryManager[LNPeerAddr]): + INITIAL_TRAMPOLINE_FEE_LEVEL = 1 # only used for trampoline payments. set to 0 in tests. + def __init__(self, xprv, features: LnFeatures): Logger.__init__(self) NetworkRetryManager.__init__( @@ -1150,7 +1152,7 @@ class LNWallet(LNWorker): raise OnionRoutingFailure(code=OnionFailureCode.TRAMPOLINE_EXPIRY_TOO_SOON, data=b'') self.logs[payment_hash.hex()] = log = [] - trampoline_fee_level = 0 # only used for trampoline payments + trampoline_fee_level = self.INITIAL_TRAMPOLINE_FEE_LEVEL use_two_trampolines = True # only used for pay to legacy amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees) diff --git a/electrum/tests/test_lnpeer.py b/electrum/tests/test_lnpeer.py index 031e64c06..d30716413 100644 --- a/electrum/tests/test_lnpeer.py +++ b/electrum/tests/test_lnpeer.py @@ -116,6 +116,7 @@ class MockWallet: class MockLNWallet(Logger, NetworkRetryManager[LNPeerAddr]): MPP_EXPIRY = 2 # HTLC timestamps are cast to int, so this cannot be 1 TIMEOUT_SHUTDOWN_FAIL_PENDING_HTLCS = 0 + INITIAL_TRAMPOLINE_FEE_LEVEL = 0 def __init__(self, *, local_keypair: Keypair, chans: Iterable['Channel'], tx_queue, name): self.name = name