merkle-tree: Get `Hash` et. al from program instead of sdk

2021-04-02 19:22:35 -06:00 · 2021-04-02 19:22:35 -06:00 · ddc0a16cec
parent a1d9b53cd7
commit ddc0a16cec
3 changed files with 3 additions and 3 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4792,7 +4792,7 @@ version = "1.7.0"
 dependencies = [
 "fast-math",
 "hex",
- "solana-sdk",
+ "solana-program 1.7.0",
 ]

 [[package]]
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-merkle-tree"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-program = { path = "../sdk/program", version = "=1.7.0" }
 fast-math = "0.1"

 [dev-dependencies]
--- a/merkle-tree/src/merkle_tree.rs
+++ b/merkle-tree/src/merkle_tree.rs
@ -1,4 +1,4 @@
-use solana_sdk::hash::{hashv, Hash};
+use solana_program::hash::{hashv, Hash};

 // We need to discern between leaf and intermediate nodes to prevent trivial second
 // pre-image attacks.