From 99432833d28ccf6627b9a12676d4747e1312ede5 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 7 Feb 2020 14:01:00 -0700 Subject: [PATCH] Remove reed-solomon-erasure from core/ --- Cargo.lock | 1 - core/Cargo.toml | 1 - core/src/result.rs | 6 ------ 3 files changed, 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17cd4b7e6d..9b44139e98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3838,7 +3838,6 @@ dependencies = [ "solana-net-utils 0.24.0", "solana-perf 0.24.0", "solana-rayon-threadlimit 0.24.0", - "solana-reed-solomon-erasure 4.0.1-3 (registry+https://github.com/rust-lang/crates.io-index)", "solana-runtime 0.24.0", "solana-sdk 0.24.0", "solana-stake-program 0.24.0", diff --git a/core/Cargo.toml b/core/Cargo.toml index 753ba2b859..2505487eb3 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -66,7 +66,6 @@ tokio-codec = "0.1" tokio-fs = "0.1" tokio-io = "0.1" solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.24.0" } -reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] } trees = "0.2.1" [dev-dependencies] diff --git a/core/src/result.rs b/core/src/result.rs index 942026d374..87c9060ed0 100644 --- a/core/src/result.rs +++ b/core/src/result.rs @@ -23,7 +23,6 @@ pub enum Error { Serialize(std::boxed::Box), TransactionError(transaction::TransactionError), ClusterInfoError(cluster_info::ClusterInfoError), - ErasureError(reed_solomon_erasure::Error), SendError, PohRecorderError(poh_recorder::PohRecorderError), BlockError(block_error::BlockError), @@ -77,11 +76,6 @@ impl std::convert::From for Error { Error::ClusterInfoError(e) } } -impl std::convert::From for Error { - fn from(e: reed_solomon_erasure::Error) -> Error { - Error::ErasureError(e) - } -} impl std::convert::From> for Error { fn from(_e: crossbeam_channel::SendError) -> Error { Error::CrossbeamSendError