Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update jsonrpc dependencies and rewrite dapps to futures. #6522

Merged
merged 25 commits into from
Oct 5, 2017
Merged

Update jsonrpc dependencies and rewrite dapps to futures. #6522

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
850acca
Bump version.
tomusdrw Sep 5, 2017
b509414
Fix RPC crate.
tomusdrw Sep 5, 2017
fb7f0bf
Fix BoxFuture in crates.
tomusdrw Sep 5, 2017
025f2da
Compiles and passes tests!
tomusdrw Sep 12, 2017
8a72209
Get rid of .boxed()
tomusdrw Sep 13, 2017
c8f6e3d
Fixing issues with the UI.
tomusdrw Sep 14, 2017
9095ec9
Merge branch 'master' into td-update-jsonrpc
tomusdrw Sep 14, 2017
ccf0a18
Remove minihttp. Support threads.
tomusdrw Sep 14, 2017
08ec476
Reimplement files serving to do it in chunks.
tomusdrw Sep 15, 2017
20f9908
Increase chunk size.
tomusdrw Sep 15, 2017
c072293
Merge branch 'master' into td-update-jsonrpc
tomusdrw Sep 15, 2017
3428ad1
Remove some unecessary copying.
tomusdrw Sep 15, 2017
4d785ab
Fix tests.
tomusdrw Sep 15, 2017
648c8ec
Fix stratum warning and ipfs todo.
tomusdrw Sep 15, 2017
eda2846
Merge branch 'master' into td-update-jsonrpc
tomusdrw Sep 15, 2017
2e2373c
Switch to proper branch of jsonrpc.
tomusdrw Sep 15, 2017
8fcafc6
Update Cargo.lock.
tomusdrw Sep 18, 2017
5bf85cd
Merge branch 'master' into td-update-jsonrpc
tomusdrw Sep 18, 2017
a6a8e2b
Merge branch 'master' into td-update-jsonrpc
tomusdrw Sep 30, 2017
c34bee9
Update docs.
tomusdrw Sep 30, 2017
5e04f45
Include dapps-glue in workspace.
tomusdrw Sep 30, 2017
314898c
Merge branch 'master' into td-update-jsonrpc
tomusdrw Oct 3, 2017
ecf26cb
fixed merge artifacts
svyatonik Oct 3, 2017
bbc7a4d
Fix test compilation.
tomusdrw Oct 3, 2017
7c78af6
Merge branch 'td-update-jsonrpc' of github.com:paritytech/parity into…
tomusdrw Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions secret_store/src/key_server_cluster/cluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,6 @@ impl ClusterCore {
Box::new(net_connect(&node_address, handle, data.self_key_pair.clone(), disconnected_nodes)
.then(move |result| ClusterCore::process_connection_result(data, Some(node_address), result))
.then(|_| finished(())))
<<<<<<< HEAD
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh, thanks!


=======
>>>>>>> master
}

/// Start listening for incoming connections.
Expand Down