Merge #14468: [wallet] Deprecate generate RPC method
ab9aca2bdf[rpc] add 'getnewaddress' hint to 'generatetoaddress' help text. (John Newbery)c9f02955b2[wallet] Deprecate the generate RPC method (John Newbery)aab81720de[tests] Add generate method to TestNode (John Newbery)c269209336[tests] Small fixups before deprecating generate (John Newbery) Pull request description: Deprecates the `generate` RPC method. For concept discussion, see #14299. Fixes #14299. Tree-SHA512: 16a3b8b742932e4f0476c06b23de07a34d9d215b41d9272c1c9d1e39966b0c2406f17c5ab3cc568947620c08171ebe5eb74fd7ed4b62151363e305ee2937cc80
This commit is contained in:
9 files changed
+68
-17
No files matched your search
@@ -129,7 +129,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||
self.start_node(0, ['-wallet=w4', '-wallet=w5'])
|
||||
assert_equal(set(node.listwallets()), {"w4", "w5"})
|
||||
w5 = wallet("w5")
|
||||
w5.generate(1)
|
||||
node.generatetoaddress(nblocks=1, address=w5.getnewaddress())
|
||||
|
||||
# now if wallets/ exists again, but the rootdir is specified as the walletdir, w4 and w5 should still be loaded
|
||||
os.rename(wallet_dir2, wallet_dir())
|
||||
@@ -153,7 +153,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||
wallet_bad = wallet("bad")
|
||||
|
||||
# check wallet names and balances
|
||||
wallets[0].generate(1)
|
||||
node.generatetoaddress(nblocks=1, address=wallets[0].getnewaddress())
|
||||
for wallet_name, wallet in zip(wallet_names, wallets):
|
||||
info = wallet.getwalletinfo()
|
||||
assert_equal(info['immature_balance'], 50 if wallet is wallets[0] else 0)
|
||||
@@ -166,7 +166,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||
assert_raises_rpc_error(-19, "Wallet file not specified", node.getwalletinfo)
|
||||
|
||||
w1, w2, w3, w4, *_ = wallets
|
||||
w1.generate(101)
|
||||
node.generatetoaddress(nblocks=101, address=w1.getnewaddress())
|
||||
assert_equal(w1.getbalance(), 100)
|
||||
assert_equal(w2.getbalance(), 0)
|
||||
assert_equal(w3.getbalance(), 0)
|
||||
@@ -175,7 +175,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||
w1.sendtoaddress(w2.getnewaddress(), 1)
|
||||
w1.sendtoaddress(w3.getnewaddress(), 2)
|
||||
w1.sendtoaddress(w4.getnewaddress(), 3)
|
||||
w1.generate(1)
|
||||
node.generatetoaddress(nblocks=1, address=w1.getnewaddress())
|
||||
assert_equal(w2.getbalance(), 1)
|
||||
assert_equal(w3.getbalance(), 2)
|
||||
assert_equal(w4.getbalance(), 3)
|
||||
|
||||
Reference in new issue
Block a user