From 5787e18e698bce6d23aa81a8e8a3f8393ac7a50a Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 3 Apr 2023 16:11:04 +0930
Subject: [PATCH] fuzz: fix check-src/includes when fuzzing enabled.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 tests/fuzz/fuzz-addr.c                |  4 ++--
 tests/fuzz/fuzz-amount.c              |  2 +-
 tests/fuzz/fuzz-base32-64.c           |  2 +-
 tests/fuzz/fuzz-bech32.c              |  4 ++--
 tests/fuzz/fuzz-bigsize.c             |  2 +-
 tests/fuzz/fuzz-bip32.c               |  2 +-
 tests/fuzz/fuzz-channel_id.c          |  2 +-
 tests/fuzz/fuzz-close_tx.c            |  4 ++--
 tests/fuzz/fuzz-descriptor_checksum.c |  2 +-
 tests/fuzz/fuzz-hsm_encryption.c      |  2 +-
 tests/fuzz/fuzz-initial_channel.c     | 12 ++++++------
 tests/fuzz/libfuzz.c                  |  2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/fuzz/fuzz-addr.c b/tests/fuzz/fuzz-addr.c
index 96379da48..e31088f58 100644
--- a/tests/fuzz/fuzz-addr.c
+++ b/tests/fuzz/fuzz-addr.c
@@ -1,9 +1,9 @@
 #include "config.h"
-#include "common/utils.h"
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/addr.h>
 #include <common/setup.h>
+#include <common/utils.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-amount.c b/tests/fuzz/fuzz-amount.c
index 3a7864e1d..a1665c9c1 100644
--- a/tests/fuzz/fuzz-amount.c
+++ b/tests/fuzz/fuzz-amount.c
@@ -1,8 +1,8 @@
 #include "config.h"
 #include <assert.h>
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/amount.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-base32-64.c b/tests/fuzz/fuzz-base32-64.c
index 13661a3ca..9dbec2e8f 100644
--- a/tests/fuzz/fuzz-base32-64.c
+++ b/tests/fuzz/fuzz-base32-64.c
@@ -1,9 +1,9 @@
 #include "config.h"
 #include <assert.h>
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/base32.h>
 #include <common/base64.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-bech32.c b/tests/fuzz/fuzz-bech32.c
index 41f6f57cf..b3852c706 100644
--- a/tests/fuzz/fuzz-bech32.c
+++ b/tests/fuzz/fuzz-bech32.c
@@ -1,11 +1,11 @@
 #include "config.h"
 #include <assert.h>
+
+#include <common/bech32.h>
 #include <stdint.h>
 #include <string.h>
 #include <tests/fuzz/libfuzz.h>
 
-#include <common/bech32.h>
-
 void init(int *argc, char ***argv)
 {
 }
diff --git a/tests/fuzz/fuzz-bigsize.c b/tests/fuzz/fuzz-bigsize.c
index b994db622..8b8f1ea6d 100644
--- a/tests/fuzz/fuzz-bigsize.c
+++ b/tests/fuzz/fuzz-bigsize.c
@@ -1,8 +1,8 @@
 #include "config.h"
 #include <assert.h>
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/bigsize.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-bip32.c b/tests/fuzz/fuzz-bip32.c
index 2c104c6d5..0231f088b 100644
--- a/tests/fuzz/fuzz-bip32.c
+++ b/tests/fuzz/fuzz-bip32.c
@@ -1,7 +1,7 @@
 #include "config.h"
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/bip32.h>
+#include <tests/fuzz/libfuzz.h>
 #include <wally_bip32.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/fuzz-channel_id.c b/tests/fuzz/fuzz-channel_id.c
index 479f575ef..c115ba873 100644
--- a/tests/fuzz/fuzz-channel_id.c
+++ b/tests/fuzz/fuzz-channel_id.c
@@ -2,10 +2,10 @@
 #include <assert.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/channel_id.h>
 #include <common/setup.h>
+#include <tests/fuzz/libfuzz.h>
 #include <wire/wire.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/fuzz-close_tx.c b/tests/fuzz/fuzz-close_tx.c
index 56e5c5f14..58f4a6720 100644
--- a/tests/fuzz/fuzz-close_tx.c
+++ b/tests/fuzz/fuzz-close_tx.c
@@ -1,13 +1,13 @@
 #include "config.h"
 #include <assert.h>
-#include <tests/fuzz/libfuzz.h>
 
-#include <bitcoin/pubkey.h>
 #include <bitcoin/chainparams.h>
+#include <bitcoin/pubkey.h>
 #include <bitcoin/script.h>
 #include <common/close_tx.h>
 #include <common/setup.h>
 #include <common/utils.h>
+#include <tests/fuzz/libfuzz.h>
 #include <wire/wire.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/fuzz-descriptor_checksum.c b/tests/fuzz/fuzz-descriptor_checksum.c
index a9a8dd6f5..dcfde4780 100644
--- a/tests/fuzz/fuzz-descriptor_checksum.c
+++ b/tests/fuzz/fuzz-descriptor_checksum.c
@@ -1,7 +1,7 @@
 #include "config.h"
-#include <tests/fuzz/libfuzz.h>
 
 #include <common/descriptor_checksum.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-hsm_encryption.c b/tests/fuzz/fuzz-hsm_encryption.c
index d0a18f736..8dce834d1 100644
--- a/tests/fuzz/fuzz-hsm_encryption.c
+++ b/tests/fuzz/fuzz-hsm_encryption.c
@@ -1,9 +1,9 @@
 #include "config.h"
 #include <assert.h>
-#include <tests/fuzz/libfuzz.h>
 
 #include <ccan/mem/mem.h>
 #include <common/hsm_encryption.h>
+#include <tests/fuzz/libfuzz.h>
 
 void init(int *argc, char ***argv)
 {
diff --git a/tests/fuzz/fuzz-initial_channel.c b/tests/fuzz/fuzz-initial_channel.c
index e76b1fc15..377ca8509 100644
--- a/tests/fuzz/fuzz-initial_channel.c
+++ b/tests/fuzz/fuzz-initial_channel.c
@@ -1,12 +1,8 @@
 #include "config.h"
-#include <assert.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <string.h>
-#include <tests/fuzz/libfuzz.h>
 
-#include <bitcoin/pubkey.h>
+#include <assert.h>
 #include <bitcoin/chainparams.h>
+#include <bitcoin/pubkey.h>
 #include <bitcoin/script.h>
 #include <bitcoin/tx.h>
 #include <ccan/tal/tal.h>
@@ -18,7 +14,11 @@
 #include <common/setup.h>
 #include <common/status.h>
 #include <common/utils.h>
+#include <fcntl.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
+#include <tests/fuzz/libfuzz.h>
 #include <wire/wire.h>
 
 void init(int *argc, char ***argv)
diff --git a/tests/fuzz/libfuzz.c b/tests/fuzz/libfuzz.c
index 8612846e3..436200b93 100644
--- a/tests/fuzz/libfuzz.c
+++ b/tests/fuzz/libfuzz.c
@@ -1,9 +1,9 @@
 #include "config.h"
-#include <tests/fuzz/libfuzz.h>
 
 #include <assert.h>
 #include <ccan/isaac/isaac64.h>
 #include <common/pseudorand.h>
+#include <tests/fuzz/libfuzz.h>
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 int LLVMFuzzerInitialize(int *argc, char ***argv);