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

test: Add cases about proposed/committed rewards #1605

Merged
merged 7 commits into from
Oct 8, 2019
Merged

test: Add cases about proposed/committed rewards #1605

merged 7 commits into from
Oct 8, 2019

Conversation

keroro520
Copy link
Contributor

  • test: Add cases about proposed/committed rewards
  • test: Add forked_transaction
  • feat(test): Provide a util function to generating live cells
  • feat(test): Add TXOSet to manage cells
  • chore: Export all test cases in specs

@keroro520 keroro520 requested review from quake and a team September 19, 2019 08:08
u2
u2 reviewed Sep 20, 2019
View reviewed changes
test/src/specs/mining/fee.rs Outdated Show resolved Hide resolved
u2
u2 reviewed Sep 20, 2019
View reviewed changes
test/src/specs/sync/chain_forks.rs Outdated Show resolved Hide resolved
test/src/specs/sync/chain_forks.rs Show resolved Hide resolved
@keroro520 keroro520 requested a review from u2 September 20, 2019 03:34
@keroro520 keroro520 added the s:waiting-on-reviewers Status: Waiting for Review label Sep 25, 2019
@u2 u2 added the s:waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Sep 30, 2019
@u2
Copy link
Contributor

u2 commented Sep 30, 2019

Please fix the conflict.

@keroro520 keroro520 merged commit a3647c6 into nervosnetwork:develop Oct 8, 2019
@keroro520 keroro520 mentioned this pull request Oct 9, 2019
Merged
bors bot added a commit that referenced this pull request Oct 9, 2019
@bors @keroro520
Merge #1684
b0ee567 
1684: fix(test): First 11 cellbases have not outputs r=quake,u2 a=keroro520

#1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it.

Co-authored-by: keroro520 <[email protected]>
bors bot added a commit that referenced this pull request Oct 9, 2019
@bors @keroro520
Merge #1684
1633a16 
1684: fix(test): First 11 cellbases have not outputs r=quake,u2 a=keroro520

#1605 did not correctly resolve conflict before merging. Hence it breaks CI for develop-branch. Here comes this PR to fix it.

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

@quake quake quake approved these changes

@u2 u2 u2 approved these changes

Assignees
No one assigned
Labels
s:waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. s:waiting-on-reviewers Status: Waiting for Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@keroro520 @u2 @quake