Fix warnings in substrate (#1523)

* Fix warnings in substrate

* More warnings removed and wasm updated

* Fixes error on stable and grumbles

* Update wasm files

* Add links to the github issue for replacing `error-chain`
This commit is contained in:
Bastian Köcher
2019-01-24 16:10:07 +01:00
committed by GitHub
parent e5285e8a8d
commit 5be237030d
13 changed files with 35 additions and 21 deletions
+4
View File
@@ -16,6 +16,10 @@
//! Initialization errors.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
use client;
use error_chain::{error_chain, error_chain_processing, impl_error_chain_processed,
impl_extract_backtrace, impl_error_chain_kind};
+3
View File
@@ -16,6 +16,9 @@
//! Substrate client possible errors.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
#![allow(missing_docs)]
use std;
+4
View File
@@ -16,6 +16,10 @@
//! Rust executor possible errors.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
use state_machine;
use serializer;
use wasmi;
+4
View File
@@ -16,6 +16,10 @@
//! Keystore (and session key management) for ed25519 based chains like Polkadot.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
extern crate substrate_primitives;
extern crate parity_crypto as crypto;
extern crate subtle;
+4
View File
@@ -16,6 +16,10 @@
//! Substrate service possible errors.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
use std::io::Error as IoError;
use network_libp2p::Error as NetworkError;
use client;
-1
View File
@@ -47,7 +47,6 @@ extern crate untrusted;
extern crate hex_literal;
#[cfg(feature = "std")]
#[macro_use]
extern crate impl_serde;
#[cfg(feature = "std")]
+4
View File
@@ -16,6 +16,10 @@
//! Errors that can occur during the service operation.
// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
// https://github.com/paritytech/substrate/issues/1547
#![allow(deprecated)]
use client;
use network;
use keystore;
+4 -10
View File
@@ -58,17 +58,11 @@ pub extern fn oom(_: ::core::alloc::Layout) -> ! {
/// (most importantly, storage) or perform heavy hash calculations.
/// See also "ext_" functions in sr-sandbox and sr-std
extern "C" {
/// Most of the functions below return fixed-size arrays (e.g. hashes) by writing them into
/// memory regions that should be preallocated by module.
/// Functions that return variable-sized data use host-side allocations. These should be
/// manually freed by the module.
fn ext_free(addr: *mut u8);
/// Printing, useful for debugging
fn ext_print_utf8(utf8_data: *const u8, utf8_len: u32);
fn ext_print_hex(data: *const u8, len: u32);
fn ext_print_num(value: u64);
/// Host storage access and verification
fn ext_set_storage(key_data: *const u8, key_len: u32, value_data: *const u8, value_len: u32);
fn ext_set_child_storage(storage_key_data: *const u8, storage_key_len: u32, key_data: *const u8, key_len: u32, value_data: *const u8, value_len: u32);
@@ -86,12 +80,12 @@ extern "C" {
fn ext_get_child_storage_into(storage_key_data: *const u8, storage_key_len: u32, key_data: *const u8, key_len: u32, value_data: *mut u8, value_len: u32, value_offset: u32) -> u32;
fn ext_storage_root(result: *mut u8);
/// Host-side result allocation
fn ext_child_storage_root(storage_key_data: *const u8, storage_key_len: u32, written_out: *mut u32) -> *mut u8;
fn ext_child_storage_root(storage_key_data: *const u8, storage_key_len: u32, written_out: *mut u32) -> *mut u8;
fn ext_storage_changes_root(parent_hash_data: *const u8, parent_hash_len: u32, parent_num: u64, result: *mut u8) -> u32;
/// The current relay chain identifier.
fn ext_chain_id() -> u64;
/// Hash calculation and verification
fn ext_blake2_256_enumerated_trie_root(values_data: *const u8, lens_data: *const u32, lens_len: u32, result: *mut u8);
fn ext_blake2_256(data: *const u8, len: u32, out: *mut u8);
@@ -283,15 +283,14 @@ fn decl_store_extra_genesis(
}
let serde_bug_bound = if serde_complete_bound.len() > 0 {
let serde_bug_bound = if !serde_complete_bound.is_empty() {
let mut b_ser = String::new();
let mut b_dser = String::new();
for bound in serde_complete_bound {
serde_complete_bound.into_iter().for_each(|bound| {
let stype = quote!(#bound);
b_ser += &(stype.to_string() + " : " + &scrate.to_string() + "::serde::Serialize, ");
b_dser += &(stype.to_string() + " : " + &scrate.to_string() + "::serde::de::DeserializeOwned, ");
}
b_ser.push_str(&format!("{} : {}::serde::Serialize, ", stype, scrate));
b_dser.push_str(&format!("{} : {}::serde::de::DeserializeOwned, ", stype, scrate));
});
quote! {
#[serde(bound(serialize = #b_ser))]
@@ -336,7 +335,7 @@ fn decl_store_extra_genesis(
};
quote!{
#[derive(Serialize, Deserialize)]
#[derive(#scrate::Serialize, #scrate::Deserialize)]
#[cfg(feature = "std")]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
@@ -730,4 +729,3 @@ fn get_type_infos(storage_type: &DeclStorageType) -> DeclStorageTypeInfos {
map_key,
}
}
+2 -1
View File
@@ -268,7 +268,7 @@ macro_rules! __events_to_metadata {
}
}
/// Constructs an Event type for a runtime. This is usually called automatically by the
/// Constructs an Event type for a runtime. This is usually called automatically by the
/// construct_runtime macro. See also __create_decl_macro.
#[macro_export]
macro_rules! impl_outer_event {
@@ -441,6 +441,7 @@ macro_rules! __impl_outer_event_json_metadata {
#[allow(dead_code)]
mod tests {
use super::*;
use serde_derive::Serialize;
mod system {
pub trait Trait {
-1
View File
@@ -38,7 +38,6 @@ extern crate substrate_inherents as inherents;
#[macro_use]
extern crate pretty_assertions;
#[cfg(feature = "std")]
#[macro_use]
extern crate serde_derive;
#[cfg(test)]
#[macro_use]