ethcore-light uses bincode 1.1 (#10798)

openethereum · Jun 27, 2019 · afe14b4 · afe14b4
1 parent 62832c9
commit afe14b4
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -32,7 +32,7 @@ smallvec = "0.6"
 futures = "0.1"
 rand = "0.6"
 itertools = "0.5"
-bincode = "0.8.0"
+bincode = "1.1"
 serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.7"

diff --git a/ethcore/light/src/net/load_timer.rs b/ethcore/light/src/net/load_timer.rs
@@ -199,15 +199,15 @@ pub struct FileStore(pub PathBuf);
 impl SampleStore for FileStore {
  fn load(&self) -> HashMap<Kind, VecDeque<u64>> {
  File::open(&self.0)
- .map_err(|e| Box::new(bincode::ErrorKind::IoError(e)))
- .and_then(|mut file| bincode::deserialize_from(&mut file, bincode::Infinite))
+ .map_err(|e| Box::new(bincode::ErrorKind::Io(e)))
+ .and_then(|mut file| bincode::deserialize_from(&mut file))
  .unwrap_or_else(|_| HashMap::new())
  }
 
  fn store(&self, samples: &HashMap<Kind, VecDeque<u64>>) {
  let res = File::create(&self.0)
- .map_err(|e| Box::new(bincode::ErrorKind::IoError(e)))
- .and_then(|mut file| bincode::serialize_into(&mut file, samples, bincode::Infinite));
+ .map_err(|e| Box::new(bincode::ErrorKind::Io(e)))
+ .and_then(|mut file| bincode::serialize_into(&mut file, samples));
 
  if let Err(e) = res {
  warn!(target: "pip", "Error writing light request timing samples to file: {}", e);