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

feat: verify tx cycles in relay protocol #341

Merged
merged 5 commits into from
Mar 20, 2019
Merged

feat: verify tx cycles in relay protocol #341

merged 5 commits into from
Mar 20, 2019

Conversation

jjyr
Copy link
Contributor

@jjyr jjyr commented Mar 19, 2019

No description provided.

@jjyr jjyr requested a review from a team March 19, 2019 04:17
zhangsoledad
zhangsoledad requested changes Mar 19, 2019
View reviewed changes
Copy link
Member

@zhangsoledad zhangsoledad left a comment

Choose a reason for hiding this comment

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

lock-acquisition multiple times unnecessarily.

@doitian
Copy link
Member

doitian commented Mar 19, 2019

bors try

bors bot added a commit that referenced this pull request Mar 19, 2019
@bors
Try #341:
6979c18
@bors
Copy link
Contributor

bors bot commented Mar 19, 2019

try

Build failed

  • continuous-integration/travis-ci/push

@doitian
Copy link
Member

doitian commented Mar 20, 2019

It seems to break the integration test https://github.com/nervosnetwork/ckb/runs/80682865

How to run integration test locally:

cargo build
cargo run -p ckb-test target/debug/ckb

cc @quake

@jjyr
Copy link
Contributor Author

jjyr commented Mar 20, 2019

bors try

@bors
Copy link
Contributor

bors bot commented Mar 20, 2019

try

Merge conflict

@jjyr jjyr force-pushed the relay-with-tx-cycles branch from f481746 to 3aa100a Compare March 20, 2019 07:43
@jjyr
Copy link
Contributor Author

jjyr commented Mar 20, 2019

bors try

bors bot added a commit that referenced this pull request Mar 20, 2019
@bors
Try #341:
a27caca
@jjyr jjyr requested a review from zhangsoledad March 20, 2019 07:47
@bors
Copy link
Contributor

bors bot commented Mar 20, 2019

try

Build succeeded

  • continuous-integration/travis-ci/push

@zhangsoledad
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Mar 20, 2019
@bors @jjyr
Merge #341
069d6c0 
341: feat: verify tx cycles in relay protocol r=zhangsoledad a=jjyr



Co-authored-by: jjy <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 20, 2019

Build succeeded

  • continuous-integration/travis-ci/push

@bors bors bot merged commit 789b7b7 into nervosnetwork:develop Mar 20, 2019
@doitian doitian mentioned this pull request Mar 27, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangsoledad zhangsoledad zhangsoledad approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jjyr @doitian @zhangsoledad