Skip to content

Merge #13007: test: Fix dangling wallet pointer in vpwallets #3666

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

Jump to bottom
Merged
UdjinM6 merged 2 commits into from
Aug 24, 2020
Merged

Merge #13007: test: Fix dangling wallet pointer in vpwallets #3666

UdjinM6 merged 2 commits into from
Aug 24, 2020

Conversation

@xdustinface
Copy link

@xdustinface xdustinface commented Aug 21, 2020

The wallet should be removed after the dumpwallet() call otherwise it
may lead to unepexted behaviour in other wallet tests since the wallet
stays in vpwallets then.

@xdustinface
test: Fix importwallet_rescan test
6710068 
The wallet should be removed after the dumpwallet() call otherwise it 
may lead to unepexted behaviour in other wallet tests since the wallet 
stays in vpwallets then.
@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Aug 21, 2020 •
edited
Loading

Good find, however, please backport (modified) bitcoin#13007 instead

@xdustinface
Copy link
Author

xdustinface commented Aug 21, 2020

Good find, however, please backport (modified) bitcoin#13007 instead

hmm after a quick check im not sure if that makes sense? First, seems like we are already behind the code in that PR and even by backporting it "modified" the outcome would be the same it seems, no?

@UdjinM6
Copy link

UdjinM6 commented Aug 22, 2020

the outcome would be the same it seems, no?

Not quite, you'd also have to move another RemoveWallet(&wallet); and place it right next to ::importwallet(request); line. Not sure if we have to actually backport 13007, could simply tweak PR title imo if the reason is to make it easy to find it in git logs after merge.

@xdustinface
Copy link
Author

xdustinface commented Aug 22, 2020

the outcome would be the same it seems, no?

Not quite, you'd also have to move another RemoveWallet(&wallet); and place it right next to ::importwallet(request); line. Not sure if we have to actually backport 13007, could simply tweak PR title imo if the reason is to make it easy to find it in git logs after merge.

That would still not follow the bitcoin PR exactly, would it? I mean our RemoveWallet(&wallet) is already few lines up from where it is in the bitcoin PR, so its already in the same scope, no?

@xdustinface xdustinface mentioned this pull request Aug 22, 2020
Merged
@PastaPastaPasta PastaPastaPasta changed the title test: Fix importwallet_rescan test Merge #13007: test: Fix dangling wallet pointer in vpwallets Aug 23, 2020
@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Aug 23, 2020

Please apply PastaPastaPasta@c9ab591, also changed title so that this is in git log showing up the backport even though due to the order of things this is kinda a backport and kinda not

PastaPastaPasta
PastaPastaPasta approved these changes Aug 24, 2020
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK, performed code review, and ran tests locally

@UdjinM6 UdjinM6 added this to the 16 milestone Aug 24, 2020
UdjinM6
UdjinM6 approved these changes Aug 24, 2020
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 changed the title Merge #13007: test: Fix dangling wallet pointer in vpwallets Merge #13007: test: Fix dangling wallet pointer in vpwallets Aug 24, 2020
@UdjinM6 UdjinM6 merged commit 997e794 into dashpay:develop Aug 24, 2020
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Sep 8, 2020
@xdustinface @PastaPastaPasta
Merge bitcoin#13007: test: Fix dangling wallet pointer in vpwallets (d…
b1a35b2 
…ashpay#3666)

* test: Fix importwallet_rescan test

The wallet should be removed after the dumpwallet() call otherwise it 
may lead to unepexted behaviour in other wallet tests since the wallet 
stays in vpwallets then.

* tests: Change where RemoveWallet call is to be more in line with upstream

Signed-off-by: pasta <[email protected]>

Co-authored-by: pasta <[email protected]>
@PastaPastaPasta PastaPastaPasta mentioned this pull request Sep 8, 2020
Merged
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Mar 13, 2022
@xdustinface @PastaPastaPasta @gades
Merge bitcoin#13007: test: Fix dangling wallet pointer in vpwallets (d…
76f1d67 
…ashpay#3666)

* test: Fix importwallet_rescan test

The wallet should be removed after the dumpwallet() call otherwise it
may lead to unepexted behaviour in other wallet tests since the wallet
stays in vpwallets then.

* tests: Change where RemoveWallet call is to be more in line with upstream

Signed-off-by: pasta <[email protected]>

Co-authored-by: pasta <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

16

Development

Successfully merging this pull request may close these issues.

3 participants

@xdustinface @PastaPastaPasta @UdjinM6