highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-15 00:59:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35192: wallet: unfriend LegacyDataSPKM and DescriptorScriptPubKeyMan

Browse Source 
6c525c2ec1 wallet: unfriend LegacyDataSPKM and DescriptorScriptPubKeyMan classes (rkrux)

Pull request description:

  After #28333, `LegacyDataSPKM` doesn't need to use the private or protected members
  of `DescriptorScriptPubKeyMan` class such as `AddDescriptorKeyWithDB` and
  `TopUpWithDB`. Moreover, these two SPKMs are siblings that inherit from the common
  `ScriptPubKeyMan` that have non intersecting use cases semantically. It seems reasonable
  to me that they are unfriended so that private members of one are not exposed to
  another unnecessarily.

ACKs for top commit:
  polespinasa:
    ACK 6c525c2ec1
  sedited:
    ACK 6c525c2ec1

Tree-SHA512: ebcd9b4e202b152b53c390f44cac46748b7fdebd4f854e84d322468a1f117e729d75210db5688dc7f38124280378f62fa469d2e5ee9adb4cb77acb2c73cc8480
This commit is contained in:
merge-script
2026-06-02 13:48:00 +02:00
parent 2e0a36c360 6c525c2ec1
commit 61d1c78ed4
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/scriptpubkeyman.h
View File

@@ -274,7 +274,6 @@ public:
class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
{
friend class LegacyDataSPKM;
private:
using ScriptPubKeyMap = std::map<CScript, int32_t>; // Map of scripts to descriptor range index
using PubKeyMap = std::map<CPubKey, int32_t>; // Map of pubkeys involved in scripts to descriptor range index