dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
141 lines
3.7 KiB
Rust
141 lines
3.7 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Lenient uint json deserialization for test json files.
|
|
|
|
use std::fmt;
|
|
use std::str::FromStr;
|
|
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
|
use serde::de::{Error, Visitor, Unexpected};
|
|
use ethereum_types::U256;
|
|
|
|
/// Lenient uint json deserialization for test json files.
|
|
#[derive(Default, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
|
|
pub struct Uint(pub U256);
|
|
|
|
impl Into<U256> for Uint {
|
|
fn into(self) -> U256 {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl Into<u64> for Uint {
|
|
fn into(self) -> u64 {
|
|
self.0.low_u64()
|
|
}
|
|
}
|
|
|
|
impl Into<usize> for Uint {
|
|
fn into(self) -> usize {
|
|
self.0.low_u64() as usize
|
|
}
|
|
}
|
|
|
|
|
|
impl Serialize for Uint {
|
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
|
where S: Serializer {
|
|
self.0.to_string().serialize(serializer)
|
|
}
|
|
}
|
|
|
|
impl<'a> Deserialize<'a> for Uint {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where D: Deserializer<'a> {
|
|
deserializer.deserialize_any(UintVisitor)
|
|
}
|
|
}
|
|
|
|
struct UintVisitor;
|
|
|
|
impl<'a> Visitor<'a> for UintVisitor {
|
|
type Value = Uint;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
write!(formatter, "a hex encoded or decimal uint")
|
|
}
|
|
|
|
fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> where E: Error {
|
|
Ok(Uint(U256::from(value)))
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: Error {
|
|
let value = match value.len() {
|
|
0 => U256::from(0),
|
|
2 if value.starts_with("0x") => U256::from(0),
|
|
_ if value.starts_with("0x") => U256::from_str(&value[2..]).map_err(|e| {
|
|
Error::custom(format!("Invalid hex value {}: {}", value, e).as_str())
|
|
})?,
|
|
_ => U256::from_dec_str(value).map_err(|e| {
|
|
Error::custom(format!("Invalid decimal value {}: {:?}", value, e).as_str())
|
|
})?
|
|
};
|
|
|
|
Ok(Uint(value))
|
|
}
|
|
|
|
fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: Error {
|
|
self.visit_str(value.as_ref())
|
|
}
|
|
}
|
|
|
|
pub fn validate_non_zero<'de, D>(d: D) -> Result<Uint, D::Error> where D: Deserializer<'de> {
|
|
let value = Uint::deserialize(d)?;
|
|
|
|
if value == Uint(U256::from(0)) {
|
|
return Err(Error::invalid_value(Unexpected::Unsigned(0), &"a non-zero value"))
|
|
}
|
|
|
|
Ok(value)
|
|
}
|
|
|
|
pub fn validate_optional_non_zero<'de, D>(d: D) -> Result<Option<Uint>, D::Error> where D: Deserializer<'de> {
|
|
let value: Option<Uint> = Option::deserialize(d)?;
|
|
|
|
if let Some(value) = value {
|
|
if value == Uint(U256::from(0)) {
|
|
return Err(Error::invalid_value(Unexpected::Unsigned(0), &"a non-zero value"))
|
|
}
|
|
}
|
|
|
|
Ok(value)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use serde_json;
|
|
use ethereum_types::U256;
|
|
use uint::Uint;
|
|
|
|
#[test]
|
|
fn uint_deserialization() {
|
|
let s = r#"["0xa", "10", "", "0x", 0]"#;
|
|
let deserialized: Vec<Uint> = serde_json::from_str(s).unwrap();
|
|
assert_eq!(deserialized, vec![
|
|
Uint(U256::from(10)),
|
|
Uint(U256::from(10)),
|
|
Uint(U256::from(0)),
|
|
Uint(U256::from(0)),
|
|
Uint(U256::from(0))
|
|
]);
|
|
}
|
|
|
|
#[test]
|
|
fn uint_into() {
|
|
assert_eq!(U256::from(10), Uint(U256::from(10)).into());
|
|
}
|
|
}
|