Skip to content

Commit

Permalink
updates reed-solomon-erasure crate version to 6.0.0 (#28033)
Browse files Browse the repository at this point in the history
Need to pick up:
rust-rse/reed-solomon-erasure#104
in order to unblock:
#27510

(cherry picked from commit f02fe9c)

# Conflicts:
#	ledger/Cargo.toml
  • Loading branch information
behzadnouri authored and mergify[bot] committed Sep 24, 2022
1 parent 810745f commit 52e4de2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
11 changes: 6 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions ledger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ prost = "0.11.0"
rand = "0.7.0"
rand_chacha = "0.2.2"
rayon = "1.5.3"
<<<<<<< HEAD
reed-solomon-erasure = { version = "5.0.3", features = ["simd-accel"] }
serde = "1.0.138"
serde_bytes = "0.11.6"
Expand All @@ -51,6 +52,29 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.14.3" }
solana-storage-proto = { path = "../storage-proto", version = "=1.14.3" }
solana-transaction-status = { path = "../transaction-status", version = "=1.14.3" }
solana-vote-program = { path = "../programs/vote", version = "=1.14.3" }
=======
reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] }
serde = "1.0.144"
serde_bytes = "0.11.7"
sha2 = "0.10.5"
solana-account-decoder = { path = "../account-decoder", version = "=1.15.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.15.0" }
solana-entry = { path = "../entry", version = "=1.15.0" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.15.0" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.15.0" }
solana-measure = { path = "../measure", version = "=1.15.0" }
solana-metrics = { path = "../metrics", version = "=1.15.0" }
solana-perf = { path = "../perf", version = "=1.15.0" }
solana-program-runtime = { path = "../program-runtime", version = "=1.15.0" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.15.0" }
solana-runtime = { path = "../runtime", version = "=1.15.0" }
solana-sdk = { path = "../sdk", version = "=1.15.0" }
solana-stake-program = { path = "../programs/stake", version = "=1.15.0" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.15.0" }
solana-storage-proto = { path = "../storage-proto", version = "=1.15.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.15.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.15.0" }
>>>>>>> f02fe9c7e (updates reed-solomon-erasure crate version to 6.0.0 (#28033))
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
static_assertions = "1.1.0"
Expand Down
11 changes: 6 additions & 5 deletions programs/bpf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 52e4de2

Please sign in to comment.