From 6c8486e7ea1cfd533739f6e6e91b7cc0777c1e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= <AlexanderMeissner@gmx.net>
Date: Thu, 6 Jun 2024 17:13:54 +0100
Subject: [PATCH] General Cargo.toml fixes.

---
 programs/sbf/Cargo.lock                       | 26 +++++++++----------
 programs/sbf/Cargo.toml                       |  4 +--
 programs/sbf/build.rs                         |  4 +--
 programs/sbf/rust/big_mod_exp/Cargo.toml      |  2 +-
 .../Cargo.toml                                |  2 +-
 .../src/lib.rs                                |  0
 .../Cargo.toml                                |  0
 .../src/lib.rs                                |  0
 programs/sbf/rust/simulation/Cargo.toml       |  2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)
 rename programs/sbf/rust/{sibling_inner_instruction => sibling_inner_instructions}/Cargo.toml (87%)
 rename programs/sbf/rust/{sibling_inner_instruction => sibling_inner_instructions}/src/lib.rs (100%)
 rename programs/sbf/rust/{sibling_instruction => sibling_instructions}/Cargo.toml (100%)
 rename programs/sbf/rust/{sibling_instruction => sibling_instructions}/src/lib.rs (100%)

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index f836c77f8a2..a14319d1938 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -4751,17 +4751,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "solana-bpf-rust-big-mod-exp"
-version = "2.0.0"
-dependencies = [
- "array-bytes",
- "serde",
- "serde_derive",
- "serde_json",
- "solana-program",
-]
-
 [[package]]
 name = "solana-bucket-map"
 version = "2.0.0"
@@ -5775,6 +5764,17 @@ dependencies = [
  "solana-program",
 ]
 
+[[package]]
+name = "solana-sbf-rust-big-mod-exp"
+version = "2.0.0"
+dependencies = [
+ "array-bytes",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-program",
+]
+
 [[package]]
 name = "solana-sbf-rust-call-depth"
 version = "2.0.0"
@@ -6069,14 +6069,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "solana-sbf-rust-sibling-instructions"
+name = "solana-sbf-rust-sibling-inner-instructions"
 version = "2.0.0"
 dependencies = [
  "solana-program",
 ]
 
 [[package]]
-name = "solana-sbf-rust-sibling_inner-instructions"
+name = "solana-sbf-rust-sibling-instructions"
 version = "2.0.0"
 dependencies = [
  "solana-program",
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
index 65e74beab75..78a73c2b11f 100644
--- a/programs/sbf/Cargo.toml
+++ b/programs/sbf/Cargo.toml
@@ -155,8 +155,8 @@ members = [
     "rust/sanity",
     "rust/secp256k1_recover",
     "rust/sha",
-    "rust/sibling_inner_instruction",
-    "rust/sibling_instruction",
+    "rust/sibling_inner_instructions",
+    "rust/sibling_instructions",
     "rust/simulation",
     "rust/spoof1",
     "rust/spoof1_system",
diff --git a/programs/sbf/build.rs b/programs/sbf/build.rs
index 46ed90b67f3..97f2423162a 100644
--- a/programs/sbf/build.rs
+++ b/programs/sbf/build.rs
@@ -103,8 +103,8 @@ fn main() {
             "sanity",
             "secp256k1_recover",
             "sha",
-            "sibling_inner_instruction",
-            "sibling_instruction",
+            "sibling_inner_instructions",
+            "sibling_instructions",
             "simulation",
             "spoof1",
             "spoof1_system",
diff --git a/programs/sbf/rust/big_mod_exp/Cargo.toml b/programs/sbf/rust/big_mod_exp/Cargo.toml
index c915bbcbd96..c2945fad48d 100644
--- a/programs/sbf/rust/big_mod_exp/Cargo.toml
+++ b/programs/sbf/rust/big_mod_exp/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "solana-bpf-rust-big-mod-exp"
+name = "solana-sbf-rust-big-mod-exp"
 version = { workspace = true }
 description = { workspace = true }
 authors = { workspace = true }
diff --git a/programs/sbf/rust/sibling_inner_instruction/Cargo.toml b/programs/sbf/rust/sibling_inner_instructions/Cargo.toml
similarity index 87%
rename from programs/sbf/rust/sibling_inner_instruction/Cargo.toml
rename to programs/sbf/rust/sibling_inner_instructions/Cargo.toml
index 67b3180e36a..8cae2ac59c5 100644
--- a/programs/sbf/rust/sibling_inner_instruction/Cargo.toml
+++ b/programs/sbf/rust/sibling_inner_instructions/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "solana-sbf-rust-sibling_inner-instructions"
+name = "solana-sbf-rust-sibling-inner-instructions"
 version = { workspace = true }
 description = { workspace = true }
 authors = { workspace = true }
diff --git a/programs/sbf/rust/sibling_inner_instruction/src/lib.rs b/programs/sbf/rust/sibling_inner_instructions/src/lib.rs
similarity index 100%
rename from programs/sbf/rust/sibling_inner_instruction/src/lib.rs
rename to programs/sbf/rust/sibling_inner_instructions/src/lib.rs
diff --git a/programs/sbf/rust/sibling_instruction/Cargo.toml b/programs/sbf/rust/sibling_instructions/Cargo.toml
similarity index 100%
rename from programs/sbf/rust/sibling_instruction/Cargo.toml
rename to programs/sbf/rust/sibling_instructions/Cargo.toml
diff --git a/programs/sbf/rust/sibling_instruction/src/lib.rs b/programs/sbf/rust/sibling_instructions/src/lib.rs
similarity index 100%
rename from programs/sbf/rust/sibling_instruction/src/lib.rs
rename to programs/sbf/rust/sibling_instructions/src/lib.rs
diff --git a/programs/sbf/rust/simulation/Cargo.toml b/programs/sbf/rust/simulation/Cargo.toml
index 3fdaee0bb1e..b7c616f4203 100644
--- a/programs/sbf/rust/simulation/Cargo.toml
+++ b/programs/sbf/rust/simulation/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-sbf-rust-simulation"
-description = "Solana SBF Program Simulation Differences"
 version = { workspace = true }
+description = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }