wallet: erase spkmans rather than setting to nullptr

achow101 · achow101 · commit b945a31afac6 · 2021-07-01T01:22:38.000-04:00
In many places in ScriptPubKeyMan managing code, we assume that the
ScriptPubKeyMan being retrieved actually exists and is not a nullptr.
Thus removing a ScriptPubKeyMan requires erasing the object from the
map rather than setting it to a nullptr.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3184,7 +3184,7 @@ void CWallet::LoadActiveScriptPubKeyMan(uint256 id, OutputType type, bool intern
     spk_mans[type] = spk_man;
 
     if (spk_mans_other[type] == spk_man) {
-        spk_mans_other[type] = nullptr;
+        spk_mans_other.erase(type);
     }
 
     NotifyCanGetAddressesChanged();
@@ -3201,7 +3201,7 @@ void CWallet::DeactivateScriptPubKeyMan(uint256 id, OutputType type, bool intern
         }
 
         auto& spk_mans = internal ? m_internal_spk_managers : m_external_spk_managers;
-        spk_mans[type] = nullptr;
+        spk_mans.erase(type);
     }
 
     NotifyCanGetAddressesChanged();

Original file line number	Diff line number	Diff line change
`@@ -3184,7 +3184,7 @@ void CWallet::LoadActiveScriptPubKeyMan(uint256 id, OutputType type, bool intern`
`3184`	`3184`	`spk_mans[type] = spk_man;`
`3185`	`3185`
`3186`	`3186`	`if (spk_mans_other[type] == spk_man) {`
`3187`		`- spk_mans_other[type] = nullptr;`
	`3187`	`+ spk_mans_other.erase(type);`
`3188`	`3188`	`}`
`3189`	`3189`
`3190`	`3190`	`NotifyCanGetAddressesChanged();`
`@@ -3201,7 +3201,7 @@ void CWallet::DeactivateScriptPubKeyMan(uint256 id, OutputType type, bool intern`
`3201`	`3201`	`}`
`3202`	`3202`
`3203`	`3203`	`auto& spk_mans = internal ? m_internal_spk_managers : m_external_spk_managers;`
`3204`		`- spk_mans[type] = nullptr;`
	`3204`	`+ spk_mans.erase(type);`
`3205`	`3205`	`}`
`3206`	`3206`
`3207`	`3207`	`NotifyCanGetAddressesChanged();`