From ce9a7012a2cf02a1d295316071d91a9acceaed25 Mon Sep 17 00:00:00 2001
From: Hardhat Chad <hardhatchad@gmail.com>
Date: Mon, 8 Jul 2024 18:12:51 +0000
Subject: [PATCH] rename utils to ore-utils

---
 Cargo.lock         | 20 ++++++++++----------
 Cargo.toml         |  3 ++-
 api/Cargo.toml     |  2 +-
 api/src/lib.rs     |  2 +-
 program/Cargo.toml |  4 ++--
 program/src/lib.rs |  2 +-
 utils/Cargo.toml   |  6 +-----
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d229be..3325105 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2591,13 +2591,13 @@ dependencies = [
  "drillx",
  "mpl-token-metadata",
  "num_enum 0.7.2",
+ "ore-utils",
  "shank",
  "solana-program",
  "spl-associated-token-account",
  "spl-token",
  "static_assertions",
  "thiserror",
- "utils",
 ]
 
 [[package]]
@@ -2608,6 +2608,7 @@ dependencies = [
  "drillx",
  "mpl-token-metadata",
  "ore-api",
+ "ore-utils",
  "rand 0.8.5",
  "solana-program",
  "solana-program-test",
@@ -2615,7 +2616,14 @@ dependencies = [
  "spl-associated-token-account",
  "spl-token",
  "tokio",
- "utils",
+]
+
+[[package]]
+name = "ore-utils"
+version = "2.0.0"
+dependencies = [
+ "bytemuck",
+ "solana-program",
 ]
 
 [[package]]
@@ -5714,14 +5722,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utils"
-version = "2.0.0"
-dependencies = [
- "bytemuck",
- "solana-program",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 99d4d7e..41d214d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,10 +19,11 @@ const-crypto = "0.1.0"
 drillx = { git = "https://github.com/regolith-labs/drillx", branch = "master", features = ["solana"] }
 mpl-token-metadata = "4.1.2"
 num_enum = "0.7.2"
+ore-api = { path = "api" }
+ore-utils = { path = "utils" }
 shank = "0.3.0"
 solana-program = "1.18"
 spl-token = { version = "^4", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "^2.2", features = [ "no-entrypoint" ] } 
 static_assertions = "1.1.0"
 thiserror = "1.0.57"
-utils = { path = "utils" }
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 224c77f..cc90bb1 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -16,10 +16,10 @@ const-crypto.workspace = true
 drillx.workspace = true
 mpl-token-metadata.workspace = true
 num_enum.workspace = true
+ore-utils.workspace = true
 shank.workspace = true
 solana-program.workspace = true
 spl-token.workspace = true
 spl-associated-token-account.workspace = true
 static_assertions.workspace = true
 thiserror.workspace = true
-utils.workspace = true
\ No newline at end of file
diff --git a/api/src/lib.rs b/api/src/lib.rs
index 6218ce7..80f2952 100644
--- a/api/src/lib.rs
+++ b/api/src/lib.rs
@@ -5,7 +5,7 @@ pub mod instruction;
 pub mod loaders;
 pub mod state;
 
-pub(crate) use utils;
+pub(crate) use ore_utils as utils;
 
 use solana_program::declare_id;
 
diff --git a/program/Cargo.toml b/program/Cargo.toml
index cb97a8e..06bb23a 100644
--- a/program/Cargo.toml
+++ b/program/Cargo.toml
@@ -21,11 +21,11 @@ default = []
 [dependencies]
 drillx.workspace = true
 mpl-token-metadata.workspace = true
-ore-api = { path = "../api" }
+ore-api.workspace = true
+ore-utils.workspace = true
 solana-program.workspace = true
 spl-token.workspace = true
 spl-associated-token-account.workspace = true
-utils.workspace = true
 
 [dev-dependencies]
 bs64 = "0.1.2"
diff --git a/program/src/lib.rs b/program/src/lib.rs
index acb5b86..e36f9db 100644
--- a/program/src/lib.rs
+++ b/program/src/lib.rs
@@ -26,7 +26,7 @@ use solana_program::{
     pubkey::Pubkey,
 };
 
-pub(crate) use utils;
+pub(crate) use ore_utils as utils;
 
 #[cfg(not(feature = "no-entrypoint"))]
 solana_program::entrypoint!(process_instruction);
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
index cc44d0f..3e40a35 100644
--- a/utils/Cargo.toml
+++ b/utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "utils"
+name = "ore-utils"
 description = "Utils for building ORE programs"
 version.workspace = true
 edition.workspace = true
@@ -9,10 +9,6 @@ documentation.workspace = true
 repository.workspace = true
 keywords.workspace = true
 
-[lib]
-crate-type = ["cdylib", "lib"]
-name = "utils"
-
 [dependencies]
 bytemuck.workspace = true
 solana-program.workspace = true