This reverts commit d04566415e16ae685af066384f346dff522c068f from #22929.
This commit was based on invalid assumption that mapTxSpends
should contain only outgoing txs and broke wallet conflicts feature.
This reverts commit d04566415e16ae685af066384f346dff522c068f.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
Can we get a test for this behavior?
Added a test, that fails before the revert and passes after. Not sure if there are other things to test.
But on the second thought, I should’ve just added some new assertions in an existing test rather than a create a new test file. I’ll find a new home for it, maybe in wallet_abandonconflict.py
. Wdyt?
verify wallet conflicts from the receiver's side
The rename in the test seems unnecessary. It adds a lot of noise to the commit.
We need two wallets on the same node to verify the intended behavior. That means we need to specify wallet each time we call an RPC.
One way we can workaround that is to unload the second wallet. But I’m not convinced this is better as it makes the test more fragile. Do you have other ideas how to avoid renames?
We need two wallets on the same node to verify the intended behavior. That means we need to specify wallet each time we call an RPC.
Ah, it looked like you were just replacing self.nodes[0]
and self.nodes[1]
with alice
, and bob
, but looking more closely, it is actually different.
Confirmed:
I think it’d be a better test if the wallets aren’t in the same node, but I guess this is fine.
tACK