Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 04:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

not sure how this ever worked... (#465)

Browse source
This commit is contained in:
AntiochP 2017-12-11 12:54:26 -05:00 committed by GitHub
parent 1e796642c4
commit 8e6f54779e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -22,7 +22,7 @@ clap = "^2.23.3"
daemonize = "^0.2.3" daemonize = "^0.2.3"
serde = "~1.0.8" serde = "~1.0.8"
serde_derive = "~1.0.8" serde_derive = "~1.0.8"
serde_json = "=1.0.7" serde_json = "~1.0.7"
slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] }
# TODO - once "patch" is available we should be able to clean up the workspace dependencies # TODO - once "patch" is available we should be able to clean up the workspace dependencies

2
api/Cargo.toml
View file

@ -21,4 +21,4 @@ mount = "~0.3.0"
urlencoded = "~0.5.0" urlencoded = "~0.5.0"
serde = "~1.0.8" serde = "~1.0.8"
serde_derive = "~1.0.8" serde_derive = "~1.0.8"
serde_json = "=1.0.7" serde_json = "~1.0.7"

2
grin/Cargo.toml
View file

@ -23,7 +23,7 @@ slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_
time = "^0.1" time = "^0.1"
serde = "~1.0.8" serde = "~1.0.8"
serde_derive = "~1.0.8" serde_derive = "~1.0.8"
serde_json = "=1.0.7" serde_json = "~1.0.7"
tokio-core="~0.1.1" tokio-core="~0.1.1"
tokio-timer="~0.1.0" tokio-timer="~0.1.0"
rand = "^0.3" rand = "^0.3"

2
keychain/Cargo.toml
View file

@ -10,5 +10,5 @@ rand = "~0.3"
slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] }
serde = "~1.0.8" serde = "~1.0.8"
serde_derive = "~1.0.8" serde_derive = "~1.0.8"
serde_json = "=1.0.7" serde_json = "~1.0.7"
grin_util = { path = "../util" } grin_util = { path = "../util" }

4
keychain/src/extkey.rs
View file

@ -91,7 +91,7 @@ impl<'de> de::Deserialize<'de> for Identifier {
where where
D: de::Deserializer<'de>, D: de::Deserializer<'de>,
{ {
deserializer.deserialize_u64(IdentifierVisitor) deserializer.deserialize_str(IdentifierVisitor)
} }
} }
@ -108,7 +108,6 @@ impl<'de> de::Visitor<'de> for IdentifierVisitor {
where where
E: de::Error, E: de::Error,
{ {
// TODO - error handling here
let identifier = Identifier::from_hex(s).unwrap(); let identifier = Identifier::from_hex(s).unwrap();
Ok(identifier) Ok(identifier)
} }
@ -299,7 +298,6 @@ mod test {
let has_an_identifier = HasAnIdentifier { identifier }; let has_an_identifier = HasAnIdentifier { identifier };
let json = serde_json::to_string(&has_an_identifier).unwrap(); let json = serde_json::to_string(&has_an_identifier).unwrap();
assert_eq!(json, "{\"identifier\":\"942b6c0bd43bdcb24f3e\"}"); assert_eq!(json, "{\"identifier\":\"942b6c0bd43bdcb24f3e\"}");
let deserialized: HasAnIdentifier = serde_json::from_str(&json).unwrap(); let deserialized: HasAnIdentifier = serde_json::from_str(&json).unwrap();

2
wallet/Cargo.toml
View file

@ -15,7 +15,7 @@ rand = "^0.3"
blake2-rfc = "~0.2.17" blake2-rfc = "~0.2.17"
serde = "~1.0.8" serde = "~1.0.8"
serde_derive = "~1.0.8" serde_derive = "~1.0.8"
serde_json = "=1.0.7" serde_json = "~1.0.7"
bodyparser = "~0.7.0" bodyparser = "~0.7.0"
futures = "^0.1.15" futures = "^0.1.15"
iron = "~0.5.1" iron = "~0.5.1"