gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
mergify[bot]
2020-07-01 20:17:37 +00:00
committed by GitHub
parent 8021bce41f
commit a97feedcc1
33 changed files with 60 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
programs/bpf/Cargo.lock generated
View File

@ -1418,7 +1418,6 @@ version = "1.2.9"
dependencies = [
"solana-bpf-rust-128bit-dep 1.2.9",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1426,7 +1425,6 @@ name = "solana-bpf-rust-128bit-dep"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1434,7 +1432,6 @@ name = "solana-bpf-rust-alloc"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1443,7 +1440,6 @@ version = "1.2.9"
dependencies = [
"byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1451,7 +1447,6 @@ name = "solana-bpf-rust-dup-accounts"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1461,7 +1456,6 @@ dependencies = [
"num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
"thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1470,7 +1464,6 @@ name = "solana-bpf-rust-external-spend"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1479,7 +1472,6 @@ version = "1.2.9"
dependencies = [
"solana-bpf-rust-invoked 1.2.9",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1487,7 +1479,6 @@ name = "solana-bpf-rust-invoked"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1495,7 +1486,6 @@ name = "solana-bpf-rust-iter"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1504,7 +1494,6 @@ version = "1.2.9"
dependencies = [
"solana-bpf-rust-many-args-dep 1.2.9",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1512,7 +1501,6 @@ name = "solana-bpf-rust-many-args-dep"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1520,7 +1508,6 @@ name = "solana-bpf-rust-noop"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1528,7 +1515,6 @@ name = "solana-bpf-rust-panic"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1537,7 +1523,6 @@ version = "1.2.9"
dependencies = [
"solana-bpf-rust-param-passing-dep 1.2.9",
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1545,7 +1530,6 @@ name = "solana-bpf-rust-param-passing-dep"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1553,7 +1537,6 @@ name = "solana-bpf-rust-sysval"
version = "1.2.9"
dependencies = [
"solana-sdk 1.2.9",
"solana-sdk-bpf-test 1.2.9",
]
[[package]]
@ -1698,10 +1681,6 @@ dependencies = [
"thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-sdk-bpf-test"
version = "1.2.9"
[[package]]
name = "solana-sdk-macro"
version = "1.2.9"

3
programs/bpf/rust/128bit/Cargo.toml
View File

@ -15,9 +15,6 @@ edition = "2018"
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.2.9" }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/128bit/src/lib.rs
View File

@ -54,7 +54,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/128bit_dep/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

3
programs/bpf/rust/alloc/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/alloc/src/lib.rs
View File

@ -86,7 +86,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/dep_crate/Cargo.toml
View File

@ -15,9 +15,6 @@ edition = "2018"
byteorder = { version = "1", default-features = false }
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/dep_crate/src/lib.rs
View File

@ -21,7 +21,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/dup_accounts/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

3
programs/bpf/rust/error_handling/Cargo.toml
View File

@ -17,9 +17,6 @@ num-traits = "0.2"
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
thiserror = "1.0"
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

3
programs/bpf/rust/external_spend/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

1
programs/bpf/rust/invoke/Cargo.toml
View File

@ -14,7 +14,6 @@ edition = "2018"
[dependencies]
solana-bpf-rust-invoked = { path = "../invoked"}
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]

2
programs/bpf/rust/invoke/src/lib.rs
View File

@ -201,4 +201,4 @@ fn process_instruction(
Ok(())
}
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();

1
programs/bpf/rust/invoked/Cargo.toml
View File

@ -13,7 +13,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]

2
programs/bpf/rust/invoked/src/lib.rs
View File

@ -192,4 +192,4 @@ fn process_instruction(
Ok(())
}
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();

3
programs/bpf/rust/iter/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/iter/src/lib.rs
View File

@ -22,7 +22,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/many_args/Cargo.toml
View File

@ -15,9 +15,6 @@ edition = "2018"
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.2.9" }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/many_args/src/lib.rs
View File

@ -30,7 +30,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/many_args_dep/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/many_args_dep/src/lib.rs
View File

@ -52,7 +52,7 @@ pub fn many_args_sret(
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_many_args() {

3
programs/bpf/rust/noop/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/noop/src/lib.rs
View File

@ -68,7 +68,7 @@ fn process_instruction(
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_return_sstruct() {

3
programs/bpf/rust/panic/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

3
programs/bpf/rust/param_passing/Cargo.toml
View File

@ -15,9 +15,6 @@ edition = "2018"
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.2.9" }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/param_passing/src/lib.rs
View File

@ -27,7 +27,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_entrypoint() {

3
programs/bpf/rust/param_passing_dep/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

2
programs/bpf/rust/param_passing_dep/src/lib.rs
View File

@ -28,7 +28,7 @@ impl<'a> TestDep {
mod test {
use super::*;
// Pulls in the stubs required for `info!()`
solana_sdk_bpf_test::stubs!();
solana_sdk::program_stubs!();
#[test]
fn test_dep() {

3
programs/bpf/rust/sysval/Cargo.toml
View File

@ -14,9 +14,6 @@ edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
[features]
program = ["solana-sdk/program"]
default = ["program"]

3
sdk/bpf/rust/test/.gitignore vendored
View File

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

32
sdk/bpf/rust/test/src/lib.rs
View File

@ -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();
}
};
}

1
sdk/src/lib.rs
View File

@ -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"))]

48
sdk/src/program_stubs.rs Normal file
View File

@ -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();
}
};
}