Skip to content

Commit dc0cabe

Browse files
committed
test: remove getaddressinfo label tests
1 parent c7654af commit dc0cabe

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

test/functional/wallet_basic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def run_test(self):
392392
for label in [u'рыба', u'𝅘𝅥𝅯']:
393393
addr = self.nodes[0].getnewaddress()
394394
self.nodes[0].setlabel(addr, label)
395-
test_address(self.nodes[0], addr, label=label, labels=[label])
395+
test_address(self.nodes[0], addr, labels=[label])
396396
assert label in self.nodes[0].listlabels()
397397
self.nodes[0].rpc.ensure_ascii = True # restore to default
398398

test/functional/wallet_import_with_label.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ def run_test(self):
3636
address,
3737
iswatchonly=True,
3838
ismine=False,
39-
label=label,
4039
labels=[label])
4140

4241
self.log.info(
@@ -45,7 +44,7 @@ def run_test(self):
4544
)
4645
priv_key = self.nodes[0].dumpprivkey(address)
4746
self.nodes[1].importprivkey(priv_key)
48-
test_address(self.nodes[1], address, label=label, labels=[label])
47+
test_address(self.nodes[1], address, labels=[label])
4948

5049
self.log.info(
5150
"Test importaddress without label and importprivkey with label."
@@ -57,7 +56,6 @@ def run_test(self):
5756
address2,
5857
iswatchonly=True,
5958
ismine=False,
60-
label="",
6159
labels=[""])
6260

6361
self.log.info(
@@ -68,7 +66,7 @@ def run_test(self):
6866
label2 = "Test Label 2"
6967
self.nodes[1].importprivkey(priv_key2, label2)
7068

71-
test_address(self.nodes[1], address2, label=label2, labels=[label2])
69+
test_address(self.nodes[1], address2, labels=[label2])
7270

7371
self.log.info("Test importaddress with label and importprivkey with label.")
7472
self.log.info("Import a watch-only address with a label.")
@@ -79,7 +77,6 @@ def run_test(self):
7977
address3,
8078
iswatchonly=True,
8179
ismine=False,
82-
label=label3_addr,
8380
labels=[label3_addr])
8481

8582
self.log.info(
@@ -90,7 +87,7 @@ def run_test(self):
9087
label3_priv = "Test Label 3 for importprivkey"
9188
self.nodes[1].importprivkey(priv_key3, label3_priv)
9289

93-
test_address(self.nodes[1], address3, label=label3_priv, labels=[label3_priv])
90+
test_address(self.nodes[1], address3, labels=[label3_priv])
9491

9592
self.log.info(
9693
"Test importprivkey won't label new dests with the same "
@@ -104,7 +101,6 @@ def run_test(self):
104101
address4,
105102
iswatchonly=True,
106103
ismine=False,
107-
label=label4_addr,
108104
labels=[label4_addr],
109105
embedded=None)
110106

@@ -118,9 +114,9 @@ def run_test(self):
118114
self.nodes[1].importprivkey(priv_key4)
119115
embedded_addr = self.nodes[1].getaddressinfo(address4)['embedded']['address']
120116

121-
test_address(self.nodes[1], embedded_addr, label="", labels=[""])
117+
test_address(self.nodes[1], embedded_addr, labels=[""])
122118

123-
test_address(self.nodes[1], address4, label=label4_addr, labels=[label4_addr])
119+
test_address(self.nodes[1], address4, labels=[label4_addr])
124120

125121
self.stop_nodes()
126122

test/functional/wallet_importmulti.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ def run_test(self):
569569
key.p2sh_p2wpkh_addr,
570570
solvable=True,
571571
ismine=True,
572-
label=p2sh_p2wpkh_label,
573572
labels=[p2sh_p2wpkh_label])
574573

575574
# Test ranged descriptor fails if range is not specified
@@ -641,7 +640,6 @@ def run_test(self):
641640
key.p2pkh_addr,
642641
solvable=True,
643642
ismine=False,
644-
label=p2pkh_label,
645643
labels=[p2pkh_label])
646644

647645
# Test import fails if both desc and scriptPubKey are provided

test/functional/wallet_labels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def verify(self, node):
155155
if self.receive_address is not None:
156156
assert self.receive_address in self.addresses
157157
for address in self.addresses:
158-
test_address(node, address, label=self.name, labels=[self.name])
158+
test_address(node, address, labels=[self.name])
159159
assert self.name in node.listlabels()
160160
assert_equal(
161161
node.getaddressesbylabel(self.name),

test/functional/wallet_listreceivedby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def run_test(self):
128128
# set pre-state
129129
label = ''
130130
address = self.nodes[1].getnewaddress()
131-
test_address(self.nodes[1], address, label=label, labels=[label])
131+
test_address(self.nodes[1], address, labels=[label])
132132
received_by_label_json = [r for r in self.nodes[1].listreceivedbylabel() if r["label"] == label][0]
133133
balance_by_label = self.nodes[1].getreceivedbylabel(label)
134134

0 commit comments

Comments
 (0)