Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: TODO related fixes for post-v21 release #6102

Merged
merged 4 commits into from
Jul 15, 2024
Merged

fix: TODO related fixes for post-v21 release #6102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4741bcc
chore: remove outdated todo - removed by bitcoin#16898
knst Jul 8, 2024
dbed4a3
fix: update comment for wallet_keypool_hd due to bitcoin#17681 DNM
knst Jul 8, 2024
58c5d43
fix: follow-up to #6017 - enable one more assert in wallet_descriptor…
knst Jul 8, 2024
d3e842f
refactor: remove dead code which has no use since composite commands …
knst Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/rpc/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,6 @@ class RPCHelpMan
}
}

// TODO: drop it, that's dash specific workaround
[[ noreturn ]] inline void Throw() const {
throw std::runtime_error(ToString());
}

std::vector<std::string> GetArgNames() const;

const std::string m_name;
Expand Down
1 change: 0 additions & 1 deletion test/functional/mining_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def mine_chain(self):
self.connect_nodes(0, 1)
assert_equal(VERSIONBITS_TOP_BITS + (1 << VERSIONBITS_DEPLOYMENT_TESTDUMMY_BIT), self.nodes[0].getblocktemplate()['version'])
self.restart_node(0)
# TODO: replace with connect_nodes_bi
self.connect_nodes(0, 1)
self.connect_nodes(1, 0)

Expand Down
3 changes: 1 addition & 2 deletions test/functional/wallet_descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ def run_test(self):
assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.dumpprivkey, recv_wrpc.getnewaddress())
assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.dumpwallet, 'wallet.dump')
assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importwallet, 'wallet.dump')
# TODO: there is not RPC `sethdseed`
# assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.sethdseed)
assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.sethdseed)

self.log.info("Test encryption")
# Get the master fingerprint before encrypt
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_keypool_hd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def run_test(self):
addr_data = nodes[0].getaddressinfo(addr)
wallet_info = nodes[0].getwalletinfo()

# TODO: enable this assert after bitcoin#17681 is backported
# we don't have feature of replacing seed due to bitcoin#17681 is DNM, no need to check if masterfingerprint is changed
# assert addr_before_encrypting_data['hdmasterfingerprint'] != addr_data['hdmasterfingerprint']
if not self.options.descriptors:
assert addr_data['hdchainid'] == wallet_info['hdchainid']
Expand Down
Loading