diff --git a/test/util/data/bitcoin-util-test.json b/test/functional/data/util/bitcoin-util-test.json similarity index 100% rename from test/util/data/bitcoin-util-test.json rename to test/functional/data/util/bitcoin-util-test.json diff --git a/test/util/data/blanktxv1.hex b/test/functional/data/util/blanktxv1.hex similarity index 100% rename from test/util/data/blanktxv1.hex rename to test/functional/data/util/blanktxv1.hex diff --git a/test/util/data/blanktxv1.json b/test/functional/data/util/blanktxv1.json similarity index 100% rename from test/util/data/blanktxv1.json rename to test/functional/data/util/blanktxv1.json diff --git a/test/util/data/blanktxv2.hex b/test/functional/data/util/blanktxv2.hex similarity index 100% rename from test/util/data/blanktxv2.hex rename to test/functional/data/util/blanktxv2.hex diff --git a/test/util/data/blanktxv2.json b/test/functional/data/util/blanktxv2.json similarity index 100% rename from test/util/data/blanktxv2.json rename to test/functional/data/util/blanktxv2.json diff --git a/test/util/data/tt-delin1-out.hex b/test/functional/data/util/tt-delin1-out.hex similarity index 100% rename from test/util/data/tt-delin1-out.hex rename to test/functional/data/util/tt-delin1-out.hex diff --git a/test/util/data/tt-delin1-out.json b/test/functional/data/util/tt-delin1-out.json similarity index 100% rename from test/util/data/tt-delin1-out.json rename to test/functional/data/util/tt-delin1-out.json diff --git a/test/util/data/tt-delout1-out.hex b/test/functional/data/util/tt-delout1-out.hex similarity index 100% rename from test/util/data/tt-delout1-out.hex rename to test/functional/data/util/tt-delout1-out.hex diff --git a/test/util/data/tt-delout1-out.json b/test/functional/data/util/tt-delout1-out.json similarity index 100% rename from test/util/data/tt-delout1-out.json rename to test/functional/data/util/tt-delout1-out.json diff --git a/test/util/data/tt-locktime317000-out.hex b/test/functional/data/util/tt-locktime317000-out.hex similarity index 100% rename from test/util/data/tt-locktime317000-out.hex rename to test/functional/data/util/tt-locktime317000-out.hex diff --git a/test/util/data/tt-locktime317000-out.json b/test/functional/data/util/tt-locktime317000-out.json similarity index 100% rename from test/util/data/tt-locktime317000-out.json rename to test/functional/data/util/tt-locktime317000-out.json diff --git a/test/util/data/tx394b54bb.hex b/test/functional/data/util/tx394b54bb.hex similarity index 100% rename from test/util/data/tx394b54bb.hex rename to test/functional/data/util/tx394b54bb.hex diff --git a/test/util/data/txcreate1.hex b/test/functional/data/util/txcreate1.hex similarity index 100% rename from test/util/data/txcreate1.hex rename to test/functional/data/util/txcreate1.hex diff --git a/test/util/data/txcreate1.json b/test/functional/data/util/txcreate1.json similarity index 100% rename from test/util/data/txcreate1.json rename to test/functional/data/util/txcreate1.json diff --git a/test/util/data/txcreate2.hex b/test/functional/data/util/txcreate2.hex similarity index 100% rename from test/util/data/txcreate2.hex rename to test/functional/data/util/txcreate2.hex diff --git a/test/util/data/txcreate2.json b/test/functional/data/util/txcreate2.json similarity index 100% rename from test/util/data/txcreate2.json rename to test/functional/data/util/txcreate2.json diff --git a/test/util/data/txcreatedata1.hex b/test/functional/data/util/txcreatedata1.hex similarity index 100% rename from test/util/data/txcreatedata1.hex rename to test/functional/data/util/txcreatedata1.hex diff --git a/test/util/data/txcreatedata1.json b/test/functional/data/util/txcreatedata1.json similarity index 100% rename from test/util/data/txcreatedata1.json rename to test/functional/data/util/txcreatedata1.json diff --git a/test/util/data/txcreatedata2.hex b/test/functional/data/util/txcreatedata2.hex similarity index 100% rename from test/util/data/txcreatedata2.hex rename to test/functional/data/util/txcreatedata2.hex diff --git a/test/util/data/txcreatedata2.json b/test/functional/data/util/txcreatedata2.json similarity index 100% rename from test/util/data/txcreatedata2.json rename to test/functional/data/util/txcreatedata2.json diff --git a/test/util/data/txcreatedata_seq0.hex b/test/functional/data/util/txcreatedata_seq0.hex similarity index 100% rename from test/util/data/txcreatedata_seq0.hex rename to test/functional/data/util/txcreatedata_seq0.hex diff --git a/test/util/data/txcreatedata_seq0.json b/test/functional/data/util/txcreatedata_seq0.json similarity index 100% rename from test/util/data/txcreatedata_seq0.json rename to test/functional/data/util/txcreatedata_seq0.json diff --git a/test/util/data/txcreatedata_seq1.hex b/test/functional/data/util/txcreatedata_seq1.hex similarity index 100% rename from test/util/data/txcreatedata_seq1.hex rename to test/functional/data/util/txcreatedata_seq1.hex diff --git a/test/util/data/txcreatedata_seq1.json b/test/functional/data/util/txcreatedata_seq1.json similarity index 100% rename from test/util/data/txcreatedata_seq1.json rename to test/functional/data/util/txcreatedata_seq1.json diff --git a/test/util/data/txcreatemultisig1.hex b/test/functional/data/util/txcreatemultisig1.hex similarity index 100% rename from test/util/data/txcreatemultisig1.hex rename to test/functional/data/util/txcreatemultisig1.hex diff --git a/test/util/data/txcreatemultisig1.json b/test/functional/data/util/txcreatemultisig1.json similarity index 100% rename from test/util/data/txcreatemultisig1.json rename to test/functional/data/util/txcreatemultisig1.json diff --git a/test/util/data/txcreatemultisig2.hex b/test/functional/data/util/txcreatemultisig2.hex similarity index 100% rename from test/util/data/txcreatemultisig2.hex rename to test/functional/data/util/txcreatemultisig2.hex diff --git a/test/util/data/txcreatemultisig2.json b/test/functional/data/util/txcreatemultisig2.json similarity index 100% rename from test/util/data/txcreatemultisig2.json rename to test/functional/data/util/txcreatemultisig2.json diff --git a/test/util/data/txcreatemultisig3.hex b/test/functional/data/util/txcreatemultisig3.hex similarity index 100% rename from test/util/data/txcreatemultisig3.hex rename to test/functional/data/util/txcreatemultisig3.hex diff --git a/test/util/data/txcreatemultisig3.json b/test/functional/data/util/txcreatemultisig3.json similarity index 100% rename from test/util/data/txcreatemultisig3.json rename to test/functional/data/util/txcreatemultisig3.json diff --git a/test/util/data/txcreatemultisig4.hex b/test/functional/data/util/txcreatemultisig4.hex similarity index 100% rename from test/util/data/txcreatemultisig4.hex rename to test/functional/data/util/txcreatemultisig4.hex diff --git a/test/util/data/txcreatemultisig4.json b/test/functional/data/util/txcreatemultisig4.json similarity index 100% rename from test/util/data/txcreatemultisig4.json rename to test/functional/data/util/txcreatemultisig4.json diff --git a/test/util/data/txcreatemultisig5.json b/test/functional/data/util/txcreatemultisig5.json similarity index 100% rename from test/util/data/txcreatemultisig5.json rename to test/functional/data/util/txcreatemultisig5.json diff --git a/test/util/data/txcreateoutpubkey1.hex b/test/functional/data/util/txcreateoutpubkey1.hex similarity index 100% rename from test/util/data/txcreateoutpubkey1.hex rename to test/functional/data/util/txcreateoutpubkey1.hex diff --git a/test/util/data/txcreateoutpubkey1.json b/test/functional/data/util/txcreateoutpubkey1.json similarity index 100% rename from test/util/data/txcreateoutpubkey1.json rename to test/functional/data/util/txcreateoutpubkey1.json diff --git a/test/util/data/txcreateoutpubkey2.hex b/test/functional/data/util/txcreateoutpubkey2.hex similarity index 100% rename from test/util/data/txcreateoutpubkey2.hex rename to test/functional/data/util/txcreateoutpubkey2.hex diff --git a/test/util/data/txcreateoutpubkey2.json b/test/functional/data/util/txcreateoutpubkey2.json similarity index 100% rename from test/util/data/txcreateoutpubkey2.json rename to test/functional/data/util/txcreateoutpubkey2.json diff --git a/test/util/data/txcreateoutpubkey3.hex b/test/functional/data/util/txcreateoutpubkey3.hex similarity index 100% rename from test/util/data/txcreateoutpubkey3.hex rename to test/functional/data/util/txcreateoutpubkey3.hex diff --git a/test/util/data/txcreateoutpubkey3.json b/test/functional/data/util/txcreateoutpubkey3.json similarity index 100% rename from test/util/data/txcreateoutpubkey3.json rename to test/functional/data/util/txcreateoutpubkey3.json diff --git a/test/util/data/txcreatescript1.hex b/test/functional/data/util/txcreatescript1.hex similarity index 100% rename from test/util/data/txcreatescript1.hex rename to test/functional/data/util/txcreatescript1.hex diff --git a/test/util/data/txcreatescript1.json b/test/functional/data/util/txcreatescript1.json similarity index 100% rename from test/util/data/txcreatescript1.json rename to test/functional/data/util/txcreatescript1.json diff --git a/test/util/data/txcreatescript2.hex b/test/functional/data/util/txcreatescript2.hex similarity index 100% rename from test/util/data/txcreatescript2.hex rename to test/functional/data/util/txcreatescript2.hex diff --git a/test/util/data/txcreatescript2.json b/test/functional/data/util/txcreatescript2.json similarity index 100% rename from test/util/data/txcreatescript2.json rename to test/functional/data/util/txcreatescript2.json diff --git a/test/util/data/txcreatescript3.hex b/test/functional/data/util/txcreatescript3.hex similarity index 100% rename from test/util/data/txcreatescript3.hex rename to test/functional/data/util/txcreatescript3.hex diff --git a/test/util/data/txcreatescript3.json b/test/functional/data/util/txcreatescript3.json similarity index 100% rename from test/util/data/txcreatescript3.json rename to test/functional/data/util/txcreatescript3.json diff --git a/test/util/data/txcreatescript4.hex b/test/functional/data/util/txcreatescript4.hex similarity index 100% rename from test/util/data/txcreatescript4.hex rename to test/functional/data/util/txcreatescript4.hex diff --git a/test/util/data/txcreatescript4.json b/test/functional/data/util/txcreatescript4.json similarity index 100% rename from test/util/data/txcreatescript4.json rename to test/functional/data/util/txcreatescript4.json diff --git a/test/util/data/txcreatescript5.hex b/test/functional/data/util/txcreatescript5.hex similarity index 100% rename from test/util/data/txcreatescript5.hex rename to test/functional/data/util/txcreatescript5.hex diff --git a/test/util/data/txcreatescript6.hex b/test/functional/data/util/txcreatescript6.hex similarity index 100% rename from test/util/data/txcreatescript6.hex rename to test/functional/data/util/txcreatescript6.hex diff --git a/test/util/data/txcreatesignsegwit1.hex b/test/functional/data/util/txcreatesignsegwit1.hex similarity index 100% rename from test/util/data/txcreatesignsegwit1.hex rename to test/functional/data/util/txcreatesignsegwit1.hex diff --git a/test/util/data/txcreatesignv1.hex b/test/functional/data/util/txcreatesignv1.hex similarity index 100% rename from test/util/data/txcreatesignv1.hex rename to test/functional/data/util/txcreatesignv1.hex diff --git a/test/util/data/txcreatesignv1.json b/test/functional/data/util/txcreatesignv1.json similarity index 100% rename from test/util/data/txcreatesignv1.json rename to test/functional/data/util/txcreatesignv1.json diff --git a/test/util/data/txcreatesignv2.hex b/test/functional/data/util/txcreatesignv2.hex similarity index 100% rename from test/util/data/txcreatesignv2.hex rename to test/functional/data/util/txcreatesignv2.hex diff --git a/test/util/data/txreplace1.hex b/test/functional/data/util/txreplace1.hex similarity index 100% rename from test/util/data/txreplace1.hex rename to test/functional/data/util/txreplace1.hex diff --git a/test/util/data/txreplacenoinputs.hex b/test/functional/data/util/txreplacenoinputs.hex similarity index 100% rename from test/util/data/txreplacenoinputs.hex rename to test/functional/data/util/txreplacenoinputs.hex diff --git a/test/util/data/txreplaceomittedn.hex b/test/functional/data/util/txreplaceomittedn.hex similarity index 100% rename from test/util/data/txreplaceomittedn.hex rename to test/functional/data/util/txreplaceomittedn.hex diff --git a/test/util/data/txreplacesingleinput.hex b/test/functional/data/util/txreplacesingleinput.hex similarity index 100% rename from test/util/data/txreplacesingleinput.hex rename to test/functional/data/util/txreplacesingleinput.hex diff --git a/test/functional/tool_utils.py b/test/functional/tool_utils.py index 3e36d05a50b..2b175b89e6c 100755 --- a/test/functional/tool_utils.py +++ b/test/functional/tool_utils.py @@ -27,7 +27,7 @@ class ToolUtils(BitcoinTestFramework): self.skip_if_no_bitcoin_util() def run_test(self): - self.testcase_dir = Path(self.config["environment"]["SRCDIR"]) / "test" / "util" / "data" + self.testcase_dir = Path(self.config["environment"]["SRCDIR"]) / "test" / "functional" / "data" / "util" self.bins = self.get_binaries() with open(self.testcase_dir / "bitcoin-util-test.json", encoding="utf8") as f: input_data = json.loads(f.read())