|
1 | 1 | #!/usr/bin/env python3
|
2 |
| -# Copyright (c) 2017-2022 The Bitcoin Core developers |
| 2 | +# Copyright (c) 2017-present The Bitcoin Core developers |
3 | 3 | # Distributed under the MIT software license, see the accompanying
|
4 | 4 | # file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
5 | 5 | """Class for bitcoind node under test"""
|
@@ -209,7 +209,7 @@ def __del__(self):
|
209 | 209 | def __getattr__(self, name):
|
210 | 210 | """Dispatches any unrecognised messages to the RPC connection or a CLI instance."""
|
211 | 211 | if self.use_cli:
|
212 |
| - return getattr(RPCOverloadWrapper(self.cli, True), name) |
| 212 | + return getattr(RPCOverloadWrapper(self.cli), name) |
213 | 213 | else:
|
214 | 214 | assert self.rpc_connected and self.rpc is not None, self._node_msg("Error: no RPC connection")
|
215 | 215 | return getattr(RPCOverloadWrapper(self.rpc), name)
|
@@ -374,7 +374,7 @@ def setmocktime(self, timestamp):
|
374 | 374 |
|
375 | 375 | def get_wallet_rpc(self, wallet_name):
|
376 | 376 | if self.use_cli:
|
377 |
| - return RPCOverloadWrapper(self.cli("-rpcwallet={}".format(wallet_name)), True) |
| 377 | + return RPCOverloadWrapper(self.cli("-rpcwallet={}".format(wallet_name))) |
378 | 378 | else:
|
379 | 379 | assert self.rpc_connected and self.rpc, self._node_msg("RPC not connected")
|
380 | 380 | wallet_path = "wallet/{}".format(urllib.parse.quote(wallet_name))
|
@@ -925,9 +925,8 @@ def send_cli(self, clicommand=None, *args, **kwargs):
|
925 | 925 | return cli_stdout.rstrip("\n")
|
926 | 926 |
|
927 | 927 | class RPCOverloadWrapper():
|
928 |
| - def __init__(self, rpc, cli=False): |
| 928 | + def __init__(self, rpc): |
929 | 929 | self.rpc = rpc
|
930 |
| - self.is_cli = cli |
931 | 930 |
|
932 | 931 | def __getattr__(self, name):
|
933 | 932 | return getattr(self.rpc, name)
|
|
0 commit comments