Pull program stubs into SDK (bp #10704) (#10713)

* Pull program stubs into SDK (#10704)

(cherry picked from commit d77818c18b)

# Conflicts:
#	programs/bpf/Cargo.lock
#	programs/bpf/rust/128bit/Cargo.toml
#	programs/bpf/rust/128bit_dep/Cargo.toml
#	programs/bpf/rust/alloc/Cargo.toml
#	programs/bpf/rust/dep_crate/Cargo.toml
#	programs/bpf/rust/dup_accounts/Cargo.toml
#	programs/bpf/rust/error_handling/Cargo.toml
#	programs/bpf/rust/external_spend/Cargo.toml
#	programs/bpf/rust/invoke/Cargo.toml
#	programs/bpf/rust/invoked/Cargo.toml
#	programs/bpf/rust/iter/Cargo.toml
#	programs/bpf/rust/many_args/Cargo.toml
#	programs/bpf/rust/many_args_dep/Cargo.toml
#	programs/bpf/rust/noop/Cargo.toml
#	programs/bpf/rust/panic/Cargo.toml
#	programs/bpf/rust/param_passing/Cargo.toml
#	programs/bpf/rust/param_passing_dep/Cargo.toml
#	programs/bpf/rust/sysval/Cargo.toml
#	sdk/bpf/rust/test/Cargo.toml

* fix conflicts

Co-authored-by: Jack May <jack@solana.com>

sdk/bpf/rust/test/.gitignore

@@ -1,3 +0,0 @@
-/target/
-/farf/
-Cargo.lock

sdk/bpf/rust/test/src/lib.rs

@@ -1,32 +0,0 @@
-//! @brief Stubs for syscalls when building tests for x86
-
-#[no_mangle]
-/// # Safety
-pub unsafe fn sol_log_(message: *const u8, length: u64) {
-    let slice = std::slice::from_raw_parts(message, length as usize);
-    let string = std::str::from_utf8(&slice).unwrap();
-    std::println!("{}", string);
-}
-
-#[no_mangle]
-pub fn sol_log_64_(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) {
-    std::println!("{} {} {} {} {}", arg1, arg2, arg3, arg4, arg5);
-}
-
-#[no_mangle]
-pub fn sol_invoke_signed_rust() {
-    std::println!("sol_invoke_signed_rust()");
-}
-
-#[macro_export]
-macro_rules! stubs {
-    () => {
-        #[test]
-        fn pull_in_externs() {
-            use $crate::*;
-            unsafe { sol_log_("sol_log_".as_ptr(), 8) };
-            sol_log_64_(1, 2, 3, 4, 5);
-            sol_invoke_signed_rust();
-        }
-    };
-}

sdk/src/lib.rs

@@ -67,6 +67,7 @@ pub mod entrypoint;
 pub mod log;
 pub mod program;
 pub mod program_error;
+pub mod program_stubs;
 
 // Modules not usable by on-chain programs
 #[cfg(not(feature = "program"))]

sdk/src/program_stubs.rs

@@ -0,0 +1,48 @@
+//! @brief Stubs for syscalls when building tests for non-BPF targets
+
+#[cfg(not(target_arch = "bpf"))]
+fn print_line_to_stdout(_message: &str) {
+    #[cfg(not(feature = "program"))]
+    {
+        use std::io::{self, Write};
+        io::stdout()
+            .write_all(format!("{}\n", _message).as_bytes())
+            .unwrap();
+        io::stdout().flush().unwrap();
+    }
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+/// # Safety
+pub unsafe fn sol_log_(message: *const u8, length: u64) {
+    let slice = std::slice::from_raw_parts(message, length as usize);
+    let string = std::str::from_utf8(&slice).unwrap();
+    print_line_to_stdout(string);
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+pub fn sol_log_64_(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) {
+    print_line_to_stdout(&format!("{} {} {} {} {}", arg1, arg2, arg3, arg4, arg5));
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+pub fn sol_invoke_signed_rust() {
+    print_line_to_stdout("sol_invoke_signed_rust()");
+}
+
+#[macro_export]
+macro_rules! program_stubs {
+    () => {
+        #[cfg(not(target_arch = "bpf"))]
+        #[test]
+        fn pull_in_externs() {
+            use solana_sdk::program_stubs::{sol_invoke_signed_rust, sol_log_, sol_log_64_};
+            unsafe { sol_log_("sol_log_".as_ptr(), 8) };
+            sol_log_64_(1, 2, 3, 4, 5);
+            sol_invoke_signed_rust();
+        }
+    };
+}