Skip to content

Commit cee1feb

Browse files
TheBlueMattTheBlueMatt
committed
[fuzz] Take a full struct path in msg gen_target.sh
1 parent f3d5b94 commit cee1feb

File tree

2 files changed

+34
-36
lines changed

2 files changed

+34
-36
lines changed

‎fuzz/src/msg_targets/gen_target.sh

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GEN_TEST() {
4-
tn=msg_$(echo $1 | sed 's/\([a-z0-9]\)\([A-Z]\)/\1_\2/g' | tr '[:upper:]' '[:lower:]')
4+
tn=msg_$(echo $1 | sed s'/.*:://g' | sed 's/\([a-z0-9]\)\([A-Z]\)/\1_\2/g' | tr '[:upper:]' '[:lower:]')
55
fn=${tn}.rs
66
cat msg_target_template.txt | sed s/MSG_TARGET/$1/ | sed "s/TARGET_NAME/$tn/" | sed "s/TEST_MSG/$2/" | sed "s/EXTRA_ARGS/$3/" > $fn
77
echo "pub mod $tn;" >> mod.rs
@@ -11,37 +11,37 @@ echo "mod utils;" > mod.rs
1111

1212
# Note when adding new targets here you should add a similar line in src/bin/gen_target.sh
1313

14-
GEN_TEST AcceptChannel test_msg_simple ""
15-
GEN_TEST AnnouncementSignatures test_msg_simple ""
16-
GEN_TEST ClosingSigned test_msg_simple ""
17-
GEN_TEST CommitmentSigned test_msg_simple ""
18-
GEN_TEST FundingCreated test_msg_simple ""
19-
GEN_TEST ChannelReady test_msg_simple ""
20-
GEN_TEST FundingSigned test_msg_simple ""
21-
GEN_TEST GossipTimestampFilter test_msg_simple ""
22-
GEN_TEST Init test_msg_simple ""
23-
GEN_TEST OnionHopData test_msg_simple ""
24-
GEN_TEST OpenChannel test_msg_simple ""
25-
GEN_TEST Ping test_msg_simple ""
26-
GEN_TEST Pong test_msg_simple ""
27-
GEN_TEST QueryChannelRange test_msg_simple ""
28-
GEN_TEST ReplyShortChannelIdsEnd test_msg_simple ""
29-
GEN_TEST RevokeAndACK test_msg_simple ""
30-
GEN_TEST Shutdown test_msg_simple ""
31-
GEN_TEST UpdateAddHTLC test_msg_simple ""
32-
GEN_TEST UpdateFailHTLC test_msg_simple ""
33-
GEN_TEST UpdateFailMalformedHTLC test_msg_simple ""
34-
GEN_TEST UpdateFee test_msg_simple ""
35-
GEN_TEST UpdateFulfillHTLC test_msg_simple ""
14+
GEN_TEST lightning::ln::msgs::AcceptChannel test_msg_simple ""
15+
GEN_TEST lightning::ln::msgs::AnnouncementSignatures test_msg_simple ""
16+
GEN_TEST lightning::ln::msgs::ClosingSigned test_msg_simple ""
17+
GEN_TEST lightning::ln::msgs::CommitmentSigned test_msg_simple ""
18+
GEN_TEST lightning::ln::msgs::FundingCreated test_msg_simple ""
19+
GEN_TEST lightning::ln::msgs::ChannelReady test_msg_simple ""
20+
GEN_TEST lightning::ln::msgs::FundingSigned test_msg_simple ""
21+
GEN_TEST lightning::ln::msgs::GossipTimestampFilter test_msg_simple ""
22+
GEN_TEST lightning::ln::msgs::Init test_msg_simple ""
23+
GEN_TEST lightning::ln::msgs::OnionHopData test_msg_simple ""
24+
GEN_TEST lightning::ln::msgs::OpenChannel test_msg_simple ""
25+
GEN_TEST lightning::ln::msgs::Ping test_msg_simple ""
26+
GEN_TEST lightning::ln::msgs::Pong test_msg_simple ""
27+
GEN_TEST lightning::ln::msgs::QueryChannelRange test_msg_simple ""
28+
GEN_TEST lightning::ln::msgs::ReplyShortChannelIdsEnd test_msg_simple ""
29+
GEN_TEST lightning::ln::msgs::RevokeAndACK test_msg_simple ""
30+
GEN_TEST lightning::ln::msgs::Shutdown test_msg_simple ""
31+
GEN_TEST lightning::ln::msgs::UpdateAddHTLC test_msg_simple ""
32+
GEN_TEST lightning::ln::msgs::UpdateFailHTLC test_msg_simple ""
33+
GEN_TEST lightning::ln::msgs::UpdateFailMalformedHTLC test_msg_simple ""
34+
GEN_TEST lightning::ln::msgs::UpdateFee test_msg_simple ""
35+
GEN_TEST lightning::ln::msgs::UpdateFulfillHTLC test_msg_simple ""
3636

37-
GEN_TEST ChannelReestablish test_msg ""
38-
GEN_TEST DecodedOnionErrorPacket test_msg ""
37+
GEN_TEST lightning::ln::msgs::ChannelReestablish test_msg ""
38+
GEN_TEST lightning::ln::msgs::DecodedOnionErrorPacket test_msg ""
3939

40-
GEN_TEST ChannelAnnouncement test_msg_exact ""
41-
GEN_TEST NodeAnnouncement test_msg_exact ""
42-
GEN_TEST QueryShortChannelIds test_msg ""
43-
GEN_TEST ReplyChannelRange test_msg ""
40+
GEN_TEST lightning::ln::msgs::ChannelAnnouncement test_msg_exact ""
41+
GEN_TEST lightning::ln::msgs::NodeAnnouncement test_msg_exact ""
42+
GEN_TEST lightning::ln::msgs::QueryShortChannelIds test_msg ""
43+
GEN_TEST lightning::ln::msgs::ReplyChannelRange test_msg ""
4444

45-
GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
46-
GEN_TEST WarningMessage test_msg_hole ", 32, 2"
47-
GEN_TEST ChannelUpdate test_msg_hole ", 108, 1"
45+
GEN_TEST lightning::ln::msgs::ErrorMessage test_msg_hole ", 32, 2"
46+
GEN_TEST lightning::ln::msgs::WarningMessage test_msg_hole ", 32, 2"
47+
GEN_TEST lightning::ln::msgs::ChannelUpdate test_msg_hole ", 108, 1"

‎fuzz/src/msg_targets/msg_target_template.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use lightning::ln::msgs;
14-
1513
use msg_targets::utils::VecWriter;
1614
use utils::test_logger;
1715

1816
#[inline]
1917
pub fn TARGET_NAME_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
20-
TEST_MSG!(msgs::MSG_TARGET, dataEXTRA_ARGS);
18+
TEST_MSG!(MSG_TARGET, dataEXTRA_ARGS);
2119
}
2220

2321
#[no_mangle]
2422
pub extern "C" fn TARGET_NAME_run(data: *const u8, datalen: usize) {
2523
let data = unsafe { std::slice::from_raw_parts(data, datalen) };
26-
TEST_MSG!(msgs::MSG_TARGET, dataEXTRA_ARGS);
24+
TEST_MSG!(MSG_TARGET, dataEXTRA_ARGS);
2725
}

0 commit comments

Comments
 (0)