From ddc0a16cec7e98a8f44af83a7d6a90142b157b5f Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Fri, 2 Apr 2021 19:22:35 -0600
Subject: [PATCH] merkle-tree: Get `Hash` et. al from program instead of sdk

---
 Cargo.lock                     | 2 +-
 merkle-tree/Cargo.toml         | 2 +-
 merkle-tree/src/merkle_tree.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a9f8d184..eed6d19d7 100644
--- 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]]
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index ab5b3b00d..53adadf11 100644
--- 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]
diff --git a/merkle-tree/src/merkle_tree.rs b/merkle-tree/src/merkle_tree.rs
index 7bec5ed04..2834fbee9 100644
--- 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.