Skip to content

Commit

Permalink
Merge bitcoin#22794: test: Verify if wallet is compiled in rpc_invali…
Browse files Browse the repository at this point in the history
…d_address_message.py test

c2fbdca Add BECH32_INVALID_VERSION test (lsilva01)
b142f79 skip test_getaddressinfo() if wallet is disabled (lsilva01)

Pull request description:

  Most of  `test/functional/rpc_invalid_address_message.py` does not requires wallet.
  But if the project is compiled in disable-wallet mode, the entire test will be skipped.

  This PR changes the test to run the RPC tests first and then checks if the wallet is compiled.

ACKs for top commit:
  stratospher:
    tested ACK c2fbdca

Tree-SHA512: 11fa2fedf4a15aa45e3f12490df8e22290a867d5de594247211499533c32289c68c0b60bd42dbf8305e43dbcc042789e7139317ef5c9f8cf386f2d84c91b9ac2
  • Loading branch information
MarcoFalke committed Oct 11, 2021
2 parents 5b7210c + c2fbdca commit 1790a8d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions test/functional/rpc_invalid_address_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def test_validateaddress(self):
node = self.nodes[0]

Expand Down Expand Up @@ -60,6 +57,10 @@ def test_validateaddress(self):
assert info['isvalid']
assert 'error' not in info

info = node.validateaddress(BECH32_INVALID_VERSION)
assert not info['isvalid']
assert_equal(info['error'], 'Invalid Bech32 address witness version')

# Base58
info = node.validateaddress(BASE58_INVALID_PREFIX)
assert not info['isvalid']
Expand Down Expand Up @@ -87,7 +88,10 @@ def test_getaddressinfo(self):

def run_test(self):
self.test_validateaddress()
self.test_getaddressinfo()

if self.is_wallet_compiled():
self.init_wallet(0)
self.test_getaddressinfo()


if __name__ == '__main__':
Expand Down

0 comments on commit 1790a8d

Please sign in to comment.