From fa2ad5dae17b237641b8ece0e68ffcdd79d543bf Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 22 Sep 2020 15:51:12 +0200 Subject: test: Run signet test even when wallet was not compiled --- test/functional/feature_signet.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/functional/feature_signet.py b/test/functional/feature_signet.py index f85431148d..a0e7f3ee6e 100755 --- a/test/functional/feature_signet.py +++ b/test/functional/feature_signet.py @@ -22,13 +22,14 @@ signet_blocks = [ '00000020a868e8514be5e46dabd6a122132f423f36a43b716a40c394e2a8d063e1010000f4c6c717e99d800c699c25a2006a75a0c5c09f432a936f385e6fce139cdbd1a5e9964d5fae77031e7d026e0001010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff025a51feffffff0200f2052a01000000160014aaa671c82b138e3b8f510cd801e5f2bd0aa305940000000000000000776a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf94c4fecc7daa24900473044022042309f4c3c7a1a2ac8c24f890f962df1c0086cec10be0868087cfc427520cb2702201dafee8911c269b7e786e242045bb57cef3f5b0f177010c6159abae42f646cc501000120000000000000000000000000000000000000000000000000000000000000000000000000', ] + class SignetBasicTest(BitcoinTestFramework): def set_test_params(self): self.chain = "signet" self.num_nodes = 6 self.setup_clean_chain = True - shared_args1 = ["-signetchallenge=51"] # OP_TRUE - shared_args2 = [] # default challenge + shared_args1 = ["-signetchallenge=51"] # OP_TRUE + shared_args2 = [] # default challenge # we use the exact same challenge except we do it as a 2-of-2, which means it should fail shared_args3 = ["-signetchallenge=522103ad5e0edad18cb1f0fc0d28a3d4f1f3e445640337489abb10404f2d1e086be430210359ef5021964fe22d6f8e05b2463c9540ce96883fe3b278760f048f5189f2e6c452ae"] @@ -38,9 +39,6 @@ class SignetBasicTest(BitcoinTestFramework): shared_args3, shared_args3, ] - def skip_test_if_missing_module(self): - self.skip_if_no_wallet() - def run_test(self): self.log.info("basic tests using OP_TRUE challenge") @@ -53,19 +51,20 @@ class SignetBasicTest(BitcoinTestFramework): assert_equal(mining_info['networkhashps'], Decimal('0')) assert_equal(mining_info['pooledtx'], 0) - self.nodes[0].generatetoaddress(1, self.nodes[0].getnewaddress()) + self.nodes[0].generate(1) self.log.info("pregenerated signet blocks check") height = 0 for block in signet_blocks: assert_equal(self.nodes[2].submitblock(block), None) - height = height + 1 + height += 1 assert_equal(self.nodes[2].getblockcount(), height) self.log.info("pregenerated signet blocks check (incompatible solution)") assert_equal(self.nodes[4].submitblock(signet_blocks[0]), 'bad-signet-blksig') + if __name__ == '__main__': SignetBasicTest().main() -- cgit v1.2.3