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

feat: use new merkle tree #223

Merged
merged 7 commits into from
Jan 26, 2019
Merged

feat: use new merkle tree #223

merged 7 commits into from
Jan 26, 2019

Conversation

kilb
Copy link
Contributor

@kilb kilb commented Jan 24, 2019

No description provided.

@kilb kilb requested review from quake and doitian January 24, 2019 07:41
@kilb kilb changed the title use new merkle tree feat: use new merkle tree Jan 24, 2019
Copy link
Member

@doitian doitian left a comment

Choose a reason for hiding this comment

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

@kilb
Copy link
Contributor Author

kilb commented Jan 25, 2019

Please setup CI in https://github.com/nervosnetwork/merkle-tree

Only admin can setup CI.

@doitian
Copy link
Member

doitian commented Jan 25, 2019

Only admin can setup CI.

Just commit .travis.yml/appveyor.yml to the branch, CI services will run automatically when they found these files.

util/merkle-tree/Cargo.toml Outdated Show resolved Hide resolved
@doitian doitian merged commit a159cdf into develop Jan 26, 2019
@doitian doitian deleted the kilb/cbmt branch January 26, 2019 13:03
@doitian doitian mentioned this pull request Feb 11, 2019
bors bot added a commit that referenced this pull request May 1, 2020
2050: chore: upgrade p2p/tokio r=TheWaWaR,quake a=driftluo

1. Upgrade p2p, use new `BlockingFlag` to optimize performance
2. Upgrade tokio, allow recursive call `block_in_place`

p2p release note:
```
Bug Fix

    Fix session proto open/close by user part(#220)

Features

    Replace unsplit with assignment(#225)
    Upgrade tokio util(#224)
    Avoids unnecessary session id checking(#223)
    Check all underscore(#228)
    Use flag to control how to use block_in_place(#226)
    More test(#227/#220)
```

tokio release note:
```
Fix
    rt: support block_in_place in more contexts
    stream: no panic in merge() and chain() when using size_hint()
    task: include visibility modifier when defining a task-local
    sync: broadcast closing the channel no longer requires capacity 

Added
    rt: runtime::Handle::block_on
```

2053: test: save integration test logs in a specified directory r=keroro520,doitian a=yangby-cryptape

Currently, it's too hard to distinguish between integration test logs and other temporary logs, especially when make integration test to be automated.

Co-authored-by: driftluo <driftluo@foxmail.com>
Co-authored-by: Boyu Yang <yangby@cryptape.com>
bors bot added a commit that referenced this pull request May 1, 2020
2050: chore: upgrade p2p/tokio r=TheWaWaR,quake a=driftluo

1. Upgrade p2p, use new `BlockingFlag` to optimize performance
2. Upgrade tokio, allow recursive call `block_in_place`

p2p release note:
```
Bug Fix

    Fix session proto open/close by user part(#220)

Features

    Replace unsplit with assignment(#225)
    Upgrade tokio util(#224)
    Avoids unnecessary session id checking(#223)
    Check all underscore(#228)
    Use flag to control how to use block_in_place(#226)
    More test(#227/#220)
```

tokio release note:
```
Fix
    rt: support block_in_place in more contexts
    stream: no panic in merge() and chain() when using size_hint()
    task: include visibility modifier when defining a task-local
    sync: broadcast closing the channel no longer requires capacity 

Added
    rt: runtime::Handle::block_on
```

Co-authored-by: driftluo <driftluo@foxmail.com>
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.

None yet

3 participants