From 9ed953e8c372b92f36cf8d3eaaba064fee4ccb10 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Thu, 26 Apr 2018 09:35:10 -0600 Subject: [PATCH] Fix rebase fails --- src/bin/client-demo.rs | 2 +- src/bin/genesis-demo.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/client-demo.rs b/src/bin/client-demo.rs index 57bf01b297..18a1a7f660 100644 --- a/src/bin/client-demo.rs +++ b/src/bin/client-demo.rs @@ -78,7 +78,7 @@ fn main() { } println!("Parsing stdin..."); - let demo: MintDemo = serde_json::from_reader(stdin()).unwrap_or_else(|e| { + let demo: MintDemo = serde_json::from_str(&buffer).unwrap_or_else(|e| { eprintln!("failed to parse json: {}", e); exit(1); }); diff --git a/src/bin/genesis-demo.rs b/src/bin/genesis-demo.rs index 97ab45e613..522a74abad 100644 --- a/src/bin/genesis-demo.rs +++ b/src/bin/genesis-demo.rs @@ -31,7 +31,7 @@ fn main() { exit(1); } - let demo: MintDemo = serde_json::from_reader(stdin()).unwrap_or_else(|e| { + let demo: MintDemo = serde_json::from_str(&buffer).unwrap_or_else(|e| { eprintln!("failed to parse json: {}", e); exit(1); });