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

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() {