grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert to jsonrpc-derive, use jsonrpc-* from crates.io (#10298)

Browse Source 
* Use jsonrpc crates on local path

* Convert all RPC traits to use jsonrpc-derive

* Use local jsonrpc at top level

* Upgrade remaining jsonrpc dependencies

* Checkout Cargo.lock to master HEAD

* Use jsonrpc-* 10.0.1 from crates.io

* Attribute after docs
This commit is contained in:
Andrew Jones
2019-02-05 13:31:19 +00:00
committed by Wei Tang
parent 06cae8a535
commit 89ae0f0ea0
41 changed files with 973 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rpc/src/v1/helpers/light_fetch.rs
View File

@@ -29,7 +29,6 @@ use ethcore::executed::ExecutionError;
use jsonrpc_core::{Result, Error};
use jsonrpc_core::futures::{future, Future};
use jsonrpc_core::futures::future::Either;
use jsonrpc_macros::Trailing;
use light::cache::Cache;
use light::client::LightChainClient;
@@ -202,7 +201,7 @@ impl LightFetch {
}
/// Helper for getting proved execution.
pub fn proved_read_only_execution(&self, req: CallRequest, num: Trailing<BlockNumber>) -> impl Future<Item = ExecutionResult, Error = Error> + Send {
pub fn proved_read_only_execution(&self, req: CallRequest, num: Option<BlockNumber>) -> impl Future<Item = ExecutionResult, Error = Error> + Send {
const DEFAULT_GAS_PRICE: u64 = 21_000;
// (21000 G_transaction + 32000 G_create + some marginal to allow a few operations)
const START_GAS: u64 = 60_000;

2
rpc/src/v1/helpers/subscribers.rs
View File

@@ -18,7 +18,7 @@
use std::{ops, str};
use std::collections::HashMap;
use jsonrpc_macros::pubsub::{Subscriber, Sink, SubscriptionId};
use jsonrpc_pubsub::{typed::{Subscriber, Sink}, SubscriptionId};
use rand::{Rng, StdRng};
use v1::types::H64;