@@ -78,14 +78,12 @@ def test_valid_signer(self):
78
78
assert_equal (not_hww .getwalletinfo ()["external_signer" ], False )
79
79
assert_raises_rpc_error (- 8 , "Wallet flag is immutable: external_signer" , not_hww .setwalletflag , "external_signer" , True )
80
80
81
- # assert_raises_rpc_error(-4, "Multiple signers found, please specify which to use", wallet_name='not_hww', disable_private_keys=True, external_signer=True)
82
81
83
- # TODO: Handle error thrown by script
84
- # self.set_mock_result(self.nodes[1], "2")
85
- # assert_raises_rpc_error(-1, 'Unable to parse JSON',
86
- # self.nodes[1].createwallet, wallet_name='not_hww2', disable_private_keys=True, external_signer=False
87
- # )
88
- # self.clear_mock_result(self.nodes[1])
82
+ self .set_mock_result (self .nodes [1 ], '0 {"invalid json"}' )
83
+ assert_raises_rpc_error (- 1 , 'Unable to parse JSON' ,
84
+ self .nodes [1 ].createwallet , wallet_name = 'hww2' , disable_private_keys = True , external_signer = True
85
+ )
86
+ self .clear_mock_result (self .nodes [1 ])
89
87
90
88
assert_equal (hww .getwalletinfo ()["keypoolsize" ], 40 )
91
89
@@ -168,31 +166,6 @@ def test_valid_signer(self):
168
166
mock_tx = mock_psbt_signed ["hex" ]
169
167
assert mock_wallet .testmempoolaccept ([mock_tx ])[0 ]["allowed" ]
170
168
171
- # # Create a new wallet and populate with specific public keys, in order
172
- # # to work with the mock signed PSBT.
173
- # self.nodes[1].createwallet(wallet_name="hww4", disable_private_keys=True, external_signer=True)
174
- # hww4 = self.nodes[1].get_wallet_rpc("hww4")
175
- #
176
- # descriptors = [{
177
- # "desc": "wpkh([00000001/84h/1h/0']tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/0/*)#x30uthjs",
178
- # "timestamp": "now",
179
- # "range": [0, 1],
180
- # "internal": False,
181
- # "watchonly": True,
182
- # "active": True
183
- # },
184
- # {
185
- # "desc": "wpkh([00000001/84h/1h/0']tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/*)#h92akzzg",
186
- # "timestamp": "now",
187
- # "range": [0, 0],
188
- # "internal": True,
189
- # "watchonly": True,
190
- # "active": True
191
- # }]
192
-
193
- # result = hww4.importdescriptors(descriptors)
194
- # assert_equal(result[0], {'success': True})
195
- # assert_equal(result[1], {'success': True})
196
169
assert_equal (hww .getwalletinfo ()["txcount" ], 1 )
197
170
198
171
assert hww .testmempoolaccept ([mock_tx ])[0 ]["allowed" ]
@@ -232,12 +205,6 @@ def test_valid_signer(self):
232
205
assert_greater_than (res ["fee" ], res ["origfee" ])
233
206
assert_equal (res ["errors" ], [])
234
207
235
- # # Handle error thrown by script
236
- # self.set_mock_result(self.nodes[4], "2")
237
- # assert_raises_rpc_error(-1, 'Unable to parse JSON',
238
- # hww4.signerprocesspsbt, psbt_orig, "00000001"
239
- # )
240
- # self.clear_mock_result(self.nodes[4])
241
208
242
209
def test_disconnected_signer (self ):
243
210
self .log .info ('Test disconnected external signer' )
0 commit comments