Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Modified tests to use runner_features #99

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Modified tests to use runner_features #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbbf3a
using runner_features inside tests
Psycho-Pirate Jul 13, 2023
bde33c5
using stash_field_from_event inside tests
Psycho-Pirate Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions tests/test_bolt2-10-add-htlc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
funding,
htlc_sigs_to_send,
htlc_sigs_to_recv,
stash_field_from_event,
)
from lnprototest.utils import pubkey_of
from lnprototest.utils.bitcoin_utils import (
Expand Down Expand Up @@ -94,16 +95,10 @@ def test_htlc_add(runner: Runner) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="02"),
ExpectMsg("init"),
TryAll(
Msg("init", globalfeatures="", features=bitfield(data_loss_protect)),
Msg("init", globalfeatures="", features=bitfield(static_remotekey)),
Msg(
"init",
globalfeatures="",
features=bitfield(static_remotekey, anchor_outputs),
),
# And nothing.
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
Msg(
"open_channel",
Expand Down Expand Up @@ -135,7 +130,7 @@ def test_htlc_add(runner: Runner) -> None:
delayed_payment_basepoint=remote_delayed_payment_basepoint(),
htlc_basepoint=remote_htlc_basepoint(),
first_per_commitment_point=remote_per_commitment_point(0),
minimum_depth=3,
minimum_depth=stash_field_from_event("accept_channel", dummy_val=3),
channel_reserve_satoshis=9998,
),
# Create and stash Funding object and FundingTx
Expand Down Expand Up @@ -171,7 +166,13 @@ def test_htlc_add(runner: Runner) -> None:
"funding_signed", channel_id=channel_id(), signature=commitsig_to_recv()
),
# Mine it and get it deep enough to confirm channel.
Block(blockheight=103, number=3, txs=[funding_tx()]),
Block(
blockheight=103,
number=stash_field_from_event(
"accept_channel", field_name="minimum_depth", dummy_val=3
),
txs=[funding_tx()],
),
ExpectMsg(
"channel_ready",
channel_id=channel_id(),
Expand Down
34 changes: 15 additions & 19 deletions tests/test_bolt2-30-channel_type-open-accept-tlvs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,10 @@ def test_open_channel(runner: Runner, with_proposal: Any) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="02"),
ExpectMsg("init"),
TryAll(
# BOLT-a12da24dd0102c170365124782b46d9710950ac1 #9:
# | 20/21 | `option_anchor_outputs` | Anchor outputs
Msg("init", globalfeatures="", features=bitfield(13, 21)),
# BOLT #9:
# | 12/13 | `option_static_remotekey` | Static key for remote output
Msg("init", globalfeatures="", features=bitfield(13)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[13]),
),
Msg(
"open_channel",
Expand Down Expand Up @@ -107,9 +104,11 @@ def test_open_channel_empty_type(runner: Runner, with_proposal: Any) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="02"),
ExpectMsg("init"),
TryAll(
# | 12/13 | `option_static_remotekey` | Static key for remote output
Msg("init", globalfeatures="", features=bitfield(13))
# | 12/13 | `option_static_remotekey` | Static key for remote output
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[13]),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same consideration here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I'm not so sure. I did add 13 as an additional field and 13 was the bit that the test used previously. Does this change the meaning of the test as well?

),
Msg(
"open_channel",
Expand Down Expand Up @@ -166,15 +165,12 @@ def test_open_channel_bad_type(runner: Runner, with_proposal: Any) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="02"),
ExpectMsg("init"),
TryAll(
# BOLT-a12da24dd0102c170365124782b46d9710950ac1 #9:
# | 20/21 | `option_anchor_outputs` | Anchor outputs
Msg("init", globalfeatures="", features=bitfield(12, 21)),
# BOLT #9:
# | 12/13 | `option_static_remotekey` | Static key for remote output
Msg("init", globalfeatures="", features=bitfield(12)),
# And not.
Msg("init", globalfeatures="", features=""),
# BOLT #9:
# | 12/13 | `option_static_remotekey` | Static key for remote output
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[12]),
),
Msg(
"open_channel",
Expand Down
24 changes: 20 additions & 4 deletions tests/test_bolt7-01-channel_announcement-success.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,22 @@ def test_gossip_forget_channel_after_12_blocks(runner: Runner) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="03"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
Block(blockheight=103, number=6, txs=[funding_tx]),
RawMsg(funding.channel_announcement("103x1x0", "")),
# New peer connects, asking for initial_routing_sync. We *won't* relay channel_announcement, as there is no
# channel_update.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features="08"),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[3]),
),
MustNotMsg("channel_announcement"),
Disconnect(),
RawMsg(
Expand All @@ -58,7 +66,11 @@ def test_gossip_forget_channel_after_12_blocks(runner: Runner) -> None:
# Now we'll relay to a new peer.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features="08"),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[3]),
),
ExpectMsg("channel_announcement", short_channel_id="103x1x0"),
ExpectMsg(
"channel_update",
Expand All @@ -73,7 +85,11 @@ def test_gossip_forget_channel_after_12_blocks(runner: Runner) -> None:
Block(blockheight=109, number=13, txs=[funding.close_tx(200, "99")]),
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features="08"),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[3]),
),
MustNotMsg("channel_announcement"),
MustNotMsg("channel_update"),
]
Expand Down
24 changes: 20 additions & 4 deletions tests/test_bolt7-02-channel_announcement-failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ def test_premature_channel_announcement(runner: Runner) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="03"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
# txid 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d
Block(blockheight=103, txs=[funding_tx]),
TryAll(
Expand Down Expand Up @@ -72,7 +76,11 @@ def test_premature_channel_announcement(runner: Runner) -> None:
# New peer connects, asking for initial_routing_sync. We *won't* relay channel_announcement.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features="08"),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[3]),
),
MustNotMsg("channel_announcement"),
MustNotMsg("channel_update"),
]
Expand Down Expand Up @@ -144,7 +152,11 @@ def test_bad_announcement(runner: Runner) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="03"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
# txid 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d
Block(blockheight=103, number=6, txs=[funding_tx]),
TryAll(
Expand Down Expand Up @@ -215,7 +227,11 @@ def test_bad_announcement(runner: Runner) -> None:
# New peer connects, asking for initial_routing_sync. We *won't* relay channel_announcement.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features="08"),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[3]),
),
MustNotMsg("channel_announcement"),
MustNotMsg("channel_update"),
],
Expand Down
46 changes: 37 additions & 9 deletions tests/test_bolt7-10-gossip-filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
Funding,
bitfield,
)
import unittest
import pytest
import time
from lnprototest.utils import utxo, tx_spendable


def test_gossip_timestamp_filter(runner: Runner) -> None:
if runner.has_option("option_gossip_queries") is None:
unittest.SkipTest("Needs option_gossip_queries")
pytest.skip("Needs option_gossip_queries")

funding1, funding1_tx = Funding.from_utxo(
*utxo(0),
Expand All @@ -46,7 +46,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
Block(blockheight=102, txs=[tx_spendable]),
Connect(connprivkey="03"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
# txid 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d
Block(blockheight=103, number=6, txs=[funding1_tx]),
RawMsg(funding1.channel_announcement("103x1x0", "")),
Expand All @@ -61,7 +65,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
ExpectMsg("init"),
# BOLT #9:
# | 6/7 | `gossip_queries` | More sophisticated gossip control
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand Down Expand Up @@ -90,7 +98,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
# New peer connects, asks for gossip_timestamp_filter=all. update and node announcement will be relayed.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand All @@ -110,7 +122,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
# `timestamp_range`.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand All @@ -123,7 +139,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
Disconnect(),
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand All @@ -137,7 +157,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
# These two succeed in getting the gossip, then stay connected for next test.
Connect(connprivkey="05"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand All @@ -151,7 +175,11 @@ def test_gossip_timestamp_filter(runner: Runner) -> None:
),
Connect(connprivkey="06"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=bitfield(6)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[6]),
),
Msg(
"gossip_timestamp_filter",
chain_hash="06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f",
Expand Down
16 changes: 12 additions & 4 deletions tests/test_bolt7-20-query_channel_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
)
from lnprototest.utils import BitcoinUtils, tx_spendable, utxo
from typing import Optional
import unittest
import pytest
import time
import io
import zlib
Expand Down Expand Up @@ -165,7 +165,7 @@ def update_checksums(update1: Optional[Message], update2: Optional[Message]) ->

def test_query_channel_range(runner: Runner) -> None:
if runner.has_option("option_gossip_queries") is None:
unittest.SkipTest("Needs option_gossip_queries")
pytest.skip("Needs option_gossip_queries")

funding1, funding1_tx = Funding.from_utxo(
*utxo(0),
Expand Down Expand Up @@ -239,7 +239,11 @@ def test_query_channel_range(runner: Runner) -> None:
Block(blockheight=109, number=6, txs=[funding2_tx]),
Connect(connprivkey="03"),
ExpectMsg("init"),
Msg("init", globalfeatures="", features=""),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(),
),
RawMsg(funding1.channel_announcement("103x1x0", "")),
RawMsg(update_103x1x0_LOCAL),
RawMsg(funding2.channel_announcement("109x1x0", "")),
Expand All @@ -250,7 +254,11 @@ def test_query_channel_range(runner: Runner) -> None:
ExpectMsg("init"),
# BOLT #9:
# | 6/7 | `gossip_queries` | More sophisticated gossip control
Msg("init", globalfeatures="", features=bitfield(7)),
Msg(
"init",
globalfeatures=runner.runner_features(globals=True),
features=runner.runner_features(additional_features=[7]),
),
TryAll(
# No queries? Must not get anything.
[
Expand Down