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.

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 scripted diff check condition #3128

Merged
merged 1 commit into from
Oct 1, 2019
Merged

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Sep 30, 2019

Fixes the issue discovered in #3122

@UdjinM6 UdjinM6 force-pushed the fixscripteddiff branch 4 times, most recently from 901ce06 to 9138857 Compare September 30, 2019 20:23
@UdjinM6 UdjinM6 added this to the 14.1 milestone Sep 30, 2019
@UdjinM6 UdjinM6 marked this pull request as ready for review September 30, 2019 20:58
@UdjinM6
Copy link
Author

UdjinM6 commented Sep 30, 2019

Took me a while to figure it out but it finally works now I think.

There are 2 debug scripted-diff-s here:
3f8b89c - https://travis-ci.org/dashpay/dash/jobs/591689130#L658 (passed)
0b10151 - https://travis-ci.org/dashpay/dash/jobs/591689130#L673 (failed)
i.e worked as expected :)

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.

see comments

@UdjinM6 UdjinM6 changed the title [WIP] Fix scripted diff check condition Fix scripted diff check condition Sep 30, 2019
@UdjinM6
Copy link
Author

UdjinM6 commented Sep 30, 2019

@PastaPastaPasta these changes are from 2 debug commits I included to show that the patch actually works as expected, I'll drop them before merging.

@PastaPastaPasta
Copy link
Member

Yup, once those are removed, I'm utACKed for merge

@UdjinM6
Copy link
Author

UdjinM6 commented Sep 30, 2019

Cool :) I'll just wait for more people to comment here before removal to make sure they had a change to review current results.

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

concept ACK, utACK after removal of test commits

@UdjinM6
Copy link
Author

UdjinM6 commented Oct 1, 2019

Dropped 2 debug commits.

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

utACK

Copy link

@nmarley nmarley left a comment

Choose a reason for hiding this comment

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

utACK, 👍

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

@UdjinM6 UdjinM6 merged commit d9e98e3 into dashpay:develop Oct 1, 2019
barrystyle pushed a commit to PACGlobalOfficial/PAC that referenced this pull request Jan 22, 2020
@UdjinM6 UdjinM6 deleted the fixscripteddiff branch November 26, 2020 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants