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.

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

Fix on-chain goverment voting scenarios test #1727

Merged
merged 1 commit into from
Feb 2, 2023
Merged

Fix on-chain goverment voting scenarios test #1727

merged 1 commit into from
Feb 2, 2023

Conversation

Mixa84
Copy link
Contributor

@Mixa84 Mixa84 commented Feb 2, 2023

What kind of PR is this?:

/kind chore

What this PR does / why we need it:

Fix failing test.

@Mixa84 Mixa84 requested review from Jouzo and dcorral February 2, 2023 10:00
@Mixa84 Mixa84 self-assigned this Feb 2, 2023
@Bushstar Bushstar merged commit 7807454 into master Feb 2, 2023
@Bushstar Bushstar deleted the chore/fix_on_chain_goverment_Test branch February 2, 2023 10:13
shohamc1 added a commit that referenced this pull request Feb 3, 2023
@shohamc1
Squashed commit of the following:
6c20d92 
commit 32c9295
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Fri Feb 3 13:11:51 2023 +0800

    Update test

commit 15fb0e5
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Fri Feb 3 12:38:41 2023 +0800

    Use VotingInfo, remove unknown votes from output

commit 0609603
Merge: e51834a faaad56
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 22:42:22 2023 +0800

    Merge branch 'master' into proposalvotes-stats

commit faaad56
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 20:09:41 2023 +0800

    Fix setgov crashes (#1719)

    Co-authored-by: Prasanna Loganathar <pvl@prasannavl.com>

commit 7807454
Author: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
Date:   Thu Feb 2 11:13:43 2023 +0100

    Fix voting scenarios test (#1727)

commit e51834a
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 15:38:06 2023 +0800

    Fix test

commit 808ed6e
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:49:20 2023 +0800

    Redo neutral changes

commit 4a9c8f0
Merge: bc55ada b7b14c2
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:30:31 2023 +0800

    Merge branch 'master' into proposalvotes-stats

    # Conflicts:
    #	src/masternodes/rpc_proposals.cpp
    #	test/functional/feature_on_chain_government.py

commit bc55ada
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:27:51 2023 +0800

    Refactor tests

commit e47befd
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:25:13 2023 +0800

    Default cycles fix

commit 44d0a02
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 15:08:29 2023 +0800

    Fix isMine default

commit 7246e04
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:51:04 2023 +0800

    Fix multiple proposal output when aggregating

commit 8b072df
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:45:48 2023 +0800

    Fix output schema

commit 9fa408b
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Mon Jan 30 12:09:57 2023 +0800

    Add aggregate stats support to listgovproposalvotes
Bushstar added a commit that referenced this pull request Feb 7, 2023
@shohamc1 @Bushstar
Display vote validity in listgovproposals and add validity filter (#…
63151fd 
…1725)

* Squashed commit of the following:

commit e51834a
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 15:38:06 2023 +0800

    Fix test

commit 808ed6e
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:49:20 2023 +0800

    Redo neutral changes

commit 4a9c8f0
Merge: bc55ada b7b14c2
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:30:31 2023 +0800

    Merge branch 'master' into proposalvotes-stats

    # Conflicts:
    #	src/masternodes/rpc_proposals.cpp
    #	test/functional/feature_on_chain_government.py

commit bc55ada
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:27:51 2023 +0800

    Refactor tests

commit e47befd
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:25:13 2023 +0800

    Default cycles fix

commit 44d0a02
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 15:08:29 2023 +0800

    Fix isMine default

commit 7246e04
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:51:04 2023 +0800

    Fix multiple proposal output when aggregating

commit 8b072df
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:45:48 2023 +0800

    Fix output schema

commit 9fa408b
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Mon Jan 30 12:09:57 2023 +0800

    Add aggregate stats support to listgovproposalvotes

* Add vote validity and filter

* Squashed commit of the following:

commit 32c9295
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Fri Feb 3 13:11:51 2023 +0800

    Update test

commit 15fb0e5
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Fri Feb 3 12:38:41 2023 +0800

    Use VotingInfo, remove unknown votes from output

commit 0609603
Merge: e51834a faaad56
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 22:42:22 2023 +0800

    Merge branch 'master' into proposalvotes-stats

commit faaad56
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 20:09:41 2023 +0800

    Fix setgov crashes (#1719)

    Co-authored-by: Prasanna Loganathar <pvl@prasannavl.com>

commit 7807454
Author: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
Date:   Thu Feb 2 11:13:43 2023 +0100

    Fix voting scenarios test (#1727)

commit e51834a
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 15:38:06 2023 +0800

    Fix test

commit 808ed6e
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:49:20 2023 +0800

    Redo neutral changes

commit 4a9c8f0
Merge: bc55ada b7b14c2
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:30:31 2023 +0800

    Merge branch 'master' into proposalvotes-stats

    # Conflicts:
    #	src/masternodes/rpc_proposals.cpp
    #	test/functional/feature_on_chain_government.py

commit bc55ada
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:27:51 2023 +0800

    Refactor tests

commit e47befd
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Thu Feb 2 14:25:13 2023 +0800

    Default cycles fix

commit 44d0a02
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 15:08:29 2023 +0800

    Fix isMine default

commit 7246e04
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:51:04 2023 +0800

    Fix multiple proposal output when aggregating

commit 8b072df
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Wed Feb 1 14:45:48 2023 +0800

    Fix output schema

commit 9fa408b
Author: Shoham Chakraborty <shhmchk@gmail.com>
Date:   Mon Jan 30 12:09:57 2023 +0800

    Add aggregate stats support to listgovproposalvotes

* Remove test file

---------

Co-authored-by: Peter John Bushnell <bushsolo@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bushstar Bushstar Bushstar approved these changes

@dcorral dcorral dcorral approved these changes

@Jouzo Jouzo Awaiting requested review from Jouzo

Assignees

@Mixa84 Mixa84

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mixa84 @Bushstar @dcorral