Skip to content

Conversation

@PastaPastaPasta
Copy link
Member

No description provided.

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.

Looks good, few small issues

Copy link

Choose a reason for hiding this comment

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

nit: this was re-ordered alphabetically in the original PR, should probably do the same to minimize potential merge conflicts in the future

Copy link
Member Author

Choose a reason for hiding this comment

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

PastaPastaPasta and others added 5 commits March 27, 2020 17:43
…arate module

I manually recreated this commit, since we have A LOT of conflicts in mininode. However since it is primarily just a move, it was pretty easy to recreate

Signed-off-by: Pasta <[email protected]>
Mostly move only. Adds a few extra comments.
Signed-off-by: Pasta <[email protected]>
@PastaPastaPasta
Copy link
Member Author

force pushed rebasing on develop and fixing conflicts caused by adding devnets to mininode

@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 March 28, 2020 01:58
@PastaPastaPasta PastaPastaPasta changed the title Backport 11648 Merge #11648: [tests] Add messages.py Mar 28, 2020
@UdjinM6
Copy link

UdjinM6 commented Mar 29, 2020

Looks like some messages are/were missing fb77e3a634

@PastaPastaPasta
Copy link
Member Author

done

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 merged commit 975f73b into dashpay:develop Mar 30, 2020
@PastaPastaPasta PastaPastaPasta deleted the backport-11648 branch March 30, 2020 17:32
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Jun 30, 2021
* [tests] Tidy up mininode.py module

Mostly move only. Adds a few extra comments.

* bitcoin#11648  [tests] Move test_framework Bitcoin primitives into separate module

I manually recreated this commit, since we have A LOT of conflicts in mininode. However since it is primarily just a move, it was pretty easy to recreate

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

* add import to messages.py

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

* move import from mininode.py to messages.py

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

* fix test failure

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

* remove empty line at top of messages.py

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

* alphabetize MESSAGEMAP seperated by if it is dash specific or not

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

* remove accidentally added feefilter message

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

* Add missing getmnlistd/mnlistdiff messages to MESSAGEMAP

Co-authored-by: John Newbery <[email protected]>
Co-authored-by: UdjinM6 <[email protected]>
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Feb 21, 2022
* [tests] Tidy up mininode.py module

Mostly move only. Adds a few extra comments.

* bitcoin#11648  [tests] Move test_framework Bitcoin primitives into separate module

I manually recreated this commit, since we have A LOT of conflicts in mininode. However since it is primarily just a move, it was pretty easy to recreate

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

* add import to messages.py

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

* move import from mininode.py to messages.py

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

* fix test failure

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

* remove empty line at top of messages.py

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

* alphabetize MESSAGEMAP seperated by if it is dash specific or not

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

* remove accidentally added feefilter message

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

* Add missing getmnlistd/mnlistdiff messages to MESSAGEMAP

Co-authored-by: John Newbery <[email protected]>
Co-authored-by: UdjinM6 <[email protected]>
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.

3 participants