Skip to content

Commit

Permalink
Rename solana-program-sdk to solana-program
Browse files Browse the repository at this point in the history
  • Loading branch information
mvines committed Oct 24, 2020
1 parent 92ce381 commit dd711ab
Show file tree
Hide file tree
Showing 65 changed files with 123 additions and 127 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 27 additions & 27 deletions programs/bpf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion programs/bpf/rust/128bit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.5.0" }

[lib]
Expand Down
4 changes: 2 additions & 2 deletions programs/bpf/rust/128bit/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
use solana_program_sdk::entrypoint::SUCCESS;
extern crate solana_program;
use solana_program::entrypoint::SUCCESS;

#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/128bit_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion programs/bpf/rust/128bit_dep/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! @brief Solana Rust-based BPF program utility functions and types
extern crate solana_program_sdk;
extern crate solana_program;

pub fn uadd(x: u128, y: u128) -> u128 {
x + y
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/alloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[lib]
name = "solana_bpf_rust_alloc"
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/alloc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#[macro_use]
extern crate alloc;
use solana_program_sdk::{entrypoint::SUCCESS, info};
use solana_program::{entrypoint::SUCCESS, info};
use std::{alloc::Layout, mem};

#[no_mangle]
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/call_depth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[lib]
name = "solana_bpf_rust_call_depth"
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/call_depth/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program that tests call depth and stack usage
use solana_program_sdk::{entrypoint::SUCCESS, info};
use solana_program::{entrypoint::SUCCESS, info};

#[inline(never)]
pub fn recurse(data: &mut [u8]) {
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/custom_heap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[features]
default = ["custom-heap"]
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/custom_heap/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF that tests out using a custom heap
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo,
entrypoint,
entrypoint::{ProgramResult, HEAP_LENGTH, HEAP_START_ADDRESS},
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/dep_crate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"

[dependencies]
byteorder = { version = "1", default-features = false }
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[lib]
name = "solana_bpf_rust_dep_crate"
Expand Down
4 changes: 2 additions & 2 deletions programs/bpf/rust/dep_crate/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! @brief Example Rust-based BPF program tests dependent crates
extern crate solana_program_sdk;
extern crate solana_program;
use byteorder::{ByteOrder, LittleEndian};
use solana_program_sdk::entrypoint::SUCCESS;
use solana_program::entrypoint::SUCCESS;

#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/deprecated_loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[lib]
name = "solana_bpf_rust_deprecated_loader"
Expand Down
4 changes: 2 additions & 2 deletions programs/bpf/rust/deprecated_loader/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#![allow(unreachable_code)]

extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, bpf_loader, entrypoint_deprecated,
entrypoint_deprecated::ProgramResult, info, log::*, pubkey::Pubkey,
};
Expand Down
2 changes: 1 addition & 1 deletion programs/bpf/rust/dup_accounts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"

[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }

[lib]
name = "solana_bpf_rust_dup_accounts"
Expand Down
4 changes: 2 additions & 2 deletions programs/bpf/rust/dup_accounts/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program that tests duplicate accounts passed via accounts
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info,
program_error::ProgramError, pubkey::Pubkey,
};
Expand Down
Loading

0 comments on commit dd711ab

Please sign in to comment.