Upgrade dependencies whenever “easy” (#3556)

* Update all dependencies

* Upgrade dependencies whenever “easy”

“easy” means that there are no major changes required.

* Fix build and bump paste dependency to 0.1.6

* Remove dead code

* Re-add = dependency for futures-preview

* Add missing std features for runtime-io

* Remove git dependencies

as updated versions have been published to crates.io

* try to debug bug

* For sr-io, "std" should imply "no_oom" and "no_panic_handler".

Otherwise, rustc complains (correctly) about duplicate lang items.

* Add missing "runtime-io/std" features

* Fix compilation errors

* Prevent duplicate lang items

Rust does not allow duplicate lang items.  When compiled without the
`std` feature, `sr-io` defines two lang items.  Therefore, `sr-io`
compiled without `feature = "std"` must not be linked with `std`.

However, `pwasm-utils` and `wasmi-validation` both bring in `std` unless
compiled with `default-features = "false"`.  This caused a duplicate
lang item error.  Building both with `default-features = "false"`
prevents this error.  When building with `feature = "std"`, they should
both be built with the `std` feature, so this feature needs to be
explicitly depended on.

* Bump `impl_version`

* Make tests pass

Three tests used 1 less gas than they had previously.

* Try to un-break build

* Add a Cargo.lock file

* Revert offchain code

* Revert "Revert offchain code"

This reverts commit d216d08cc6ca0344614669c1d24cde3aa5c0d4e2.

* Don’t try to send a body with a GET request

without adding a Transfer-Encoding or Content-Length header.

This has always been wrong, but hyperium/hyper#1925 hid the bug until
hyper was upgraded to 0.12.35.

* Change some more GET requests to POST requests

* Fix excess line width and remove an `extern crate`

* Delete commented-out extern crate

Co-Authored-By: Sergei Pepyakin <sergei@parity.io>

* Fix regression in Cargo.toml files

dev-dependencies need `default-features = false`, too.

* Bump parity-wasm dependency

* Bump `futures-preview`

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update Cargo.lock files

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update core/service/src/chain_ops.rs

Co-Authored-By: Sergei Pepyakin <sergei@parity.io>
This commit is contained in:
DemiMarie-parity
2019-10-02 15:23:59 -04:00
committed by GitHub
parent f6bd58ac1f
commit 62b97a090d
121 changed files with 1307 additions and 6562 deletions
+9 -9
View File
@@ -7,30 +7,30 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
bytes = "0.4"
bytes = "0.4.12"
client = { package = "substrate-client", path = "../../core/client" }
fnv = "1.0"
fnv = "1.0.6"
futures01 = { package = "futures", version = "0.1" }
futures-preview = "0.3.0-alpha.18"
futures-timer = "0.3"
hyper = "0.12.33"
futures-preview = "0.3.0-alpha.19"
futures-timer = "0.4.0"
hyper = "0.12.35"
hyper-tls = "0.3.2"
log = "0.4"
log = "0.4.8"
offchain-primitives = { package = "substrate-offchain-primitives", path = "./primitives" }
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
parking_lot = "0.9.0"
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
rand = "0.7"
rand = "0.7.2"
sr-primitives = { path = "../../core/sr-primitives" }
transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
network = { package = "substrate-network", path = "../../core/network" }
keystore = { package = "substrate-keystore", path = "../keystore" }
[dev-dependencies]
env_logger = "0.6"
env_logger = "0.6.2"
client-db = { package = "substrate-client-db", path = "../../core/client/db/", default-features = true }
test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
tokio = "0.1"
tokio = "0.1.22"
[features]
default = []
+15 -15
View File
@@ -759,7 +759,7 @@ mod tests {
let (mut api, addr) = build_api_server!();
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[], Some(deadline)).unwrap();
match api.response_wait(&[id], Some(deadline))[0] {
@@ -805,13 +805,13 @@ mod tests {
Ok(_) => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
match api.request_add_header(id, "Foo", "\0") {
Err(()) => {}
Ok(_) => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_add_header(id, "Foo", "Bar").unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
match api.request_add_header(id, "Foo2", "Bar") {
@@ -848,7 +848,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[], None).unwrap();
@@ -857,7 +857,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[], None).unwrap();
@@ -866,7 +866,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.response_wait(&[id], None);
match api.request_write_body(id, &[], None) {
@@ -874,7 +874,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.response_wait(&[id], None);
match api.request_write_body(id, &[1, 2, 3, 4], None) {
@@ -882,7 +882,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_headers(id);
match api.request_write_body(id, &[1, 2, 3, 4], None) {
Err(HttpError::Invalid) => {}
@@ -896,14 +896,14 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_read_body(id, &mut [], None).unwrap();
match api.request_write_body(id, &[1, 2, 3, 4], None) {
Err(HttpError::Invalid) => {}
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_read_body(id, &mut [], None).unwrap();
match api.request_write_body(id, &[], None) {
Err(HttpError::Invalid) => {}
@@ -916,10 +916,10 @@ mod tests {
let (mut api, addr) = build_api_server!();
assert!(api.response_headers(HttpRequestId(0xdead)).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
assert!(api.response_headers(id).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[], None).unwrap();
while api.response_headers(id).is_empty() {
std::thread::sleep(std::time::Duration::from_millis(100));
@@ -939,10 +939,10 @@ mod tests {
fn response_header_invalid_call() {
let (mut api, addr) = build_api_server!();
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
assert!(api.response_headers(id).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_add_header(id, "Foo", "Bar").unwrap();
assert!(api.response_headers(id).is_empty());
@@ -983,7 +983,7 @@ mod tests {
let (mut api, addr) = build_api_server!();
for _ in 0..50 {
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
for _ in 0..250 {
match rand::random::<u8>() % 6 {