Rust BPF programs depend on Solana SDK (#5819)

programs/bpf/rust/128bit/Cargo.toml

@@ -12,11 +12,12 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "0.19.0-pre0" }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/128bit/src/lib.rs

@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::info;
+extern crate solana_sdk;
+use solana_sdk::info;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/128bit_dep/Cargo.toml

@@ -12,10 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/128bit_dep/src/lib.rs

@@ -1,6 +1,6 @@
 //! @brief Solana Rust-based BPF program utility functions and types
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 
 pub fn uadd(x: u128, y: u128) -> u128 {
     x + y
@@ -36,17 +36,15 @@ pub fn modulo(n: i128, d: i128) -> i128 {
 
 #[cfg(test)]
 mod test {
-    extern crate std;
     use super::*;
 
     #[test]
     fn pull_in_externs() {
-        // Rust on Linux excludes the solana_sdk_bpf_test library unless there is a
+        // Rust on Linux excludes the externs unless there is a
         // direct dependency, use this test to force the pull in of the library.
         // This is not necessary on macos and unfortunate on Linux
         // Issue #4972
-        extern crate solana_sdk_bpf_test;
-        use solana_sdk_bpf_test::*;
+        use solana_sdk::program_test::*;
         unsafe { sol_log_("X".as_ptr(), 1) };
         sol_log_64_(1, 2, 3, 4, 5);
     }

programs/bpf/rust/alloc/Cargo.toml

@@ -12,7 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/alloc/src/lib.rs

@@ -2,8 +2,8 @@
 
 #[macro_use]
 extern crate alloc;
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::info;
+extern crate solana_sdk;
+use solana_sdk::info;
 use std::alloc::Layout;
 use std::mem;
 

programs/bpf/rust/dep_crate/Cargo.toml

@@ -13,7 +13,11 @@ edition = "2018"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/dep_crate/src/lib.rs

@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests dependent crates
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 use byteorder::{ByteOrder, LittleEndian};
-use solana_sdk_bpf_utils::info;
+use solana_sdk::info;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/external_spend/Cargo.toml

@@ -12,7 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/external_spend/src/lib.rs

@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program that moves a lamport from one account to another
 
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::entrypoint;
-use solana_sdk_bpf_utils::entrypoint::*;
+extern crate solana_sdk;
+use solana_sdk::entrypoint;
+use solana_sdk::entrypoint::*;
 
 entrypoint!(process_instruction);
 fn process_instruction(ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {

programs/bpf/rust/iter/Cargo.toml

@@ -12,7 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/iter/src/lib.rs

@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::info;
+extern crate solana_sdk;
+use solana_sdk::info;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/many_args/Cargo.toml

@@ -12,9 +12,13 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "0.19.0-pre0" }
 
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
+
 [workspace]
 members = []
 

programs/bpf/rust/many_args/src/helper.rs

@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 
-use solana_sdk_bpf_utils::log::*;
+use solana_sdk::log::*;
 
 pub fn many_args(
     arg1: u64,

programs/bpf/rust/many_args/src/lib.rs

@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
 mod helper;
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::info;
+extern crate solana_sdk;
+use solana_sdk::info;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/many_args_dep/Cargo.toml

@@ -12,10 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/many_args_dep/src/lib.rs

@@ -1,7 +1,7 @@
 //! @brief Solana Rust-based BPF program utility functions and types
 
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::info;
+extern crate solana_sdk;
+use solana_sdk::info;
 
 pub fn many_args(
     arg1: u64,
@@ -55,12 +55,11 @@ mod test {
 
     #[test]
     fn pull_in_externs() {
-        // Rust on Linux excludes the solana_sdk_bpf_test library unless there is a
+        // Rust on Linux excludes the externs unless there is a
         // direct dependency, use this test to force the pull in of the library.
         // This is not necessary on macos and unfortunate on Linux
         // Issue #4972
-        extern crate solana_sdk_bpf_test;
-        use solana_sdk_bpf_test::*;
+        use solana_sdk::program_test::*;
         unsafe { sol_log_("X".as_ptr(), 1) };
         sol_log_64_(1, 2, 3, 4, 5);
     }

programs/bpf/rust/noop/Cargo.toml

@@ -12,7 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/noop/src/lib.rs

@@ -2,10 +2,10 @@
 
 #![allow(unreachable_code)]
 
-extern crate solana_sdk_bpf_utils;
-use solana_sdk_bpf_utils::entrypoint::*;
-use solana_sdk_bpf_utils::log::*;
-use solana_sdk_bpf_utils::{entrypoint, info};
+extern crate solana_sdk;
+use solana_sdk::entrypoint::*;
+use solana_sdk::log::*;
+use solana_sdk::{entrypoint, info};
 
 #[derive(Debug, PartialEq)]
 struct SStruct {

programs/bpf/rust/panic/Cargo.toml

@@ -12,7 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/panic/src/lib.rs

@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program that panics
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/param_passing/Cargo.toml

@@ -12,11 +12,12 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "0.19.0-pre0" }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/param_passing/src/lib.rs

@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 use solana_bpf_rust_param_passing_dep::{Data, TestDep};
-use solana_sdk_bpf_utils::info;
+use solana_sdk::info;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> bool {

programs/bpf/rust/param_passing_dep/Cargo.toml

@@ -12,10 +12,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/param_passing_dep/src/lib.rs

@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 
 pub struct Data<'a> {
     pub twentyone: u64,

programs/bpf/rust/tick_height/Cargo.toml

@@ -13,7 +13,11 @@ edition = "2018"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
+solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program"]
 
 [workspace]
 members = []

programs/bpf/rust/tick_height/src/lib.rs

@@ -1,9 +1,9 @@
 //! @brief Example Rust-based BPF program that prints out the parameters passed to it
 
-extern crate solana_sdk_bpf_utils;
+extern crate solana_sdk;
 use byteorder::{ByteOrder, LittleEndian};
-use solana_sdk_bpf_utils::entrypoint::*;
-use solana_sdk_bpf_utils::{entrypoint, info};
+use solana_sdk::entrypoint::*;
+use solana_sdk::{entrypoint, info};
 
 entrypoint!(process_instruction);
 fn process_instruction(ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {