Move test to cargo-build-sbf, update version

anza-xyz · Oct 14, 2024 · 02c366d · 02c366d
1 parent 5900020
commit 02c366d
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -435,7 +435,7 @@ solana-msg = { path = "sdk/msg", version = "=2.1.0" }
 solana-net-utils = { path = "net-utils", version = "=2.1.0" }
 solana-nohash-hasher = "0.2.1"
 solana-notifier = { path = "notifier", version = "=2.1.0" }
-solana-package-metadata = { path = "sdk/package-metadata", version = "=2.0.0" }
+solana-package-metadata = { path = "sdk/package-metadata", version = "=2.1.0" }
 solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = "=2.1.0" }
 solana-perf = { path = "perf", version = "=2.1.0" }
 solana-poh = { path = "poh", version = "=2.1.0" }

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
@@ -44,7 +44,6 @@ solana-ledger = { path = "../../ledger", version = "=2.1.0" }
 solana-log-collector = { path = "../../log-collector", version = "=2.1.0" }
 solana-logger = { path = "../../logger", version = "=2.1.0" }
 solana-measure = { path = "../../measure", version = "=2.1.0" }
-solana-package-metadata = { path = "../../sdk/package-metadata", version = "=2.0.0" }
 solana-poseidon = { path = "../../poseidon/", version = "=2.1.0" }
 solana-program = { path = "../../sdk/program", version = "=2.1.0" }
 solana-program-runtime = { path = "../../program-runtime", version = "=2.1.0" }

diff --git a/programs/sbf/rust/simulation/Cargo.toml b/programs/sbf/rust/simulation/Cargo.toml
@@ -9,11 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-solana-package-metadata = { workspace = true }
 solana-program = { workspace = true }
 
 [lib]
 crate-type = ["cdylib"]
-
-[package.metadata.solana]
-program-id = "Sim1jD5C35odT8mzctm8BWnjic8xW5xgeb5MbcbErTo"
diff --git a/programs/sbf/rust/simulation/src/lib.rs b/programs/sbf/rust/simulation/src/lib.rs
@@ -12,7 +12,7 @@ use {
     std::convert::TryInto,
 };
 
-solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
+solana_program::declare_id!("Sim1jD5C35odT8mzctm8BWnjic8xW5xgeb5MbcbErTo");
 
 solana_program::entrypoint_no_alloc!(process_instruction);
 

diff --git a/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
@@ -11,8 +11,10 @@ publish = false
 
 [package.metadata.solana]
 tools-version = "v1.43"
+program-id = "MyProgram1111111111111111111111111111111111"
 
 [dependencies]
+solana-package-metadata = { path = "../../../../package-metadata", version = "=2.1.0" }
 solana-program = { path = "../../../../program", version = "=2.1.0" }
 
 [lib]

diff --git a/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs b/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs
@@ -2,6 +2,7 @@
 
 use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
 
+solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
 solana_program::entrypoint!(process_instruction);
 fn process_instruction(
     _program_id: &Pubkey,

diff --git a/sdk/package-metadata/Cargo.toml b/sdk/package-metadata/Cargo.toml
@@ -11,9 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 solana-package-metadata-macro = { workspace = true }
-
-[dev-dependencies]
-solana-program = { workspace = true }
+solana-pubkey = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/package-metadata/src/lib.rs b/sdk/package-metadata/src/lib.rs
@@ -16,7 +16,7 @@
 ///
 /// You can fetch the copyright with the following:
 /// ```ignore
-/// use solana_sdk_macro::package_metadata;
+/// use solana_package_metadata::package_metadata;
 ///
 /// pub fn main() {
 ///     let copyright = package_metadata!("copyright");
@@ -48,6 +48,8 @@
 /// It does *not* currently support accessing TOML array elements directly.
 /// TOML tables are not supported.
 pub use solana_package_metadata_macro::package_metadata;
+/// Re-export solana_pubkey::declare_id for easy usage within the macro
+pub use solana_pubkey::declare_id;
 
 /// Convenience macro for declaring a program id from Cargo.toml package metadata.
 ///
@@ -75,16 +77,14 @@ pub use solana_package_metadata_macro::package_metadata;
 /// This program id behaves exactly as if the developer had written:
 ///
 /// ```
-/// solana_program::declare_id!("MyProgram1111111111111111111111111111111111");
+/// solana_pubkey::declare_id!("MyProgram1111111111111111111111111111111111");
 /// ```
 ///
 /// Meaning that it's possible to refer to the program id using `crate::id()`,
 /// without needing to specify the program id in multiple places.
 #[macro_export]
 macro_rules! declare_id_with_package_metadata {
     ($key:literal) => {
-        solana_program::declare_id!(solana_program::pubkey::Pubkey::from_str_const(
-            $crate::package_metadata!($key)
-        ));
+        $crate::declare_id!($crate::package_metadata!($key));
     };
 }