s/solana_program_interface/solana[_-]sdk/g
This commit is contained in:
parent
3ae53961c8
commit
e47fcb196b
|
@ -104,14 +104,14 @@ serde_cbor = "0.9.0"
|
|||
serde_derive = "1.0.27"
|
||||
serde_json = "1.0.10"
|
||||
socket2 = "0.3.8"
|
||||
solana_program_interface = { path = "common", version = "0.10.0" }
|
||||
solana-sdk = { path = "common", version = "0.10.0" }
|
||||
sys-info = "0.5.6"
|
||||
tokio = "0.1"
|
||||
tokio-codec = "0.1"
|
||||
untrusted = "0.6.2"
|
||||
noop = { path = "programs/native/noop" }
|
||||
bpf_loader = { path = "programs/native/bpf_loader" }
|
||||
lua_loader = { path = "programs/native/lua_loader" }
|
||||
solana-noop = { path = "programs/native/noop" }
|
||||
solana-bpfloader = { path = "programs/native/bpf_loader" }
|
||||
solana-lualoader = { path = "programs/native/lua_loader" }
|
||||
|
||||
[[bench]]
|
||||
name = "bank"
|
||||
|
|
|
@ -3,7 +3,7 @@ extern crate bincode;
|
|||
extern crate rand;
|
||||
extern crate rayon;
|
||||
extern crate solana;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
extern crate test;
|
||||
|
||||
use rand::{thread_rng, Rng};
|
||||
|
@ -17,7 +17,7 @@ use solana::packet::to_packets_chunked;
|
|||
use solana::signature::{KeypairUtil, Signature};
|
||||
use solana::system_transaction::SystemTransaction;
|
||||
use solana::transaction::Transaction;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::iter;
|
||||
use std::sync::mpsc::{channel, Receiver};
|
||||
use std::sync::Arc;
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
[package]
|
||||
name = "solana_program_interface"
|
||||
name = "solana-sdk"
|
||||
version = "0.10.0"
|
||||
description = "Solana SDK"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
bincode = "1.0.0"
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
[package]
|
||||
name = "noop_rust"
|
||||
name = "solana-bpf-noop"
|
||||
version = "0.10.0"
|
||||
description = "Solana BPF noop program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
rbpf = { git = "https://github.com/qmonnet/rbpf", rev="bc41ec47d9b51751585f6ddcde1d1eb1afe2be69" }
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
[package]
|
||||
name = "bpf_loader"
|
||||
name = "solana-bpfloader"
|
||||
version = "0.10.0"
|
||||
description = "Solana BPF Loader"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
bincode = "1.0.0"
|
||||
|
@ -13,7 +16,7 @@ log = "0.4.2"
|
|||
rbpf = "0.1.0"
|
||||
serde = "1.0.27"
|
||||
serde_derive = "1.0.27"
|
||||
solana_program_interface = { path = "../../../common", version = "0.10.0" }
|
||||
solana-sdk = { path = "../../../common", version = "0.10.0" }
|
||||
|
||||
[lib]
|
||||
name = "bpf_loader"
|
||||
|
|
|
@ -6,13 +6,13 @@ extern crate env_logger;
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
extern crate rbpf;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use bincode::deserialize;
|
||||
use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
|
||||
use solana_program_interface::account::KeyedAccount;
|
||||
use solana_program_interface::loader_instruction::LoaderInstruction;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::loader_instruction::LoaderInstruction;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::io::prelude::*;
|
||||
use std::io::Error;
|
||||
use std::mem;
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
[package]
|
||||
name = "lua_loader"
|
||||
name = "solana-lualoader"
|
||||
version = "0.10.0"
|
||||
description = "Solana Lua Loader"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
bincode = "1.0.0"
|
||||
|
@ -10,7 +13,7 @@ log = "0.4.2"
|
|||
rlua = "0.15.2"
|
||||
serde = "1.0.27"
|
||||
serde_derive = "1.0.27"
|
||||
solana_program_interface = { path = "../../../common", version = "0.10.0" }
|
||||
solana-sdk = { path = "../../../common", version = "0.10.0" }
|
||||
|
||||
[dev-dependencies]
|
||||
bincode = "1.0.0"
|
||||
|
|
|
@ -3,12 +3,12 @@ extern crate env_logger;
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
extern crate rlua;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use bincode::deserialize;
|
||||
use rlua::{Lua, Result, Table};
|
||||
use solana_program_interface::account::KeyedAccount;
|
||||
use solana_program_interface::loader_instruction::LoaderInstruction;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::loader_instruction::LoaderInstruction;
|
||||
use std::str;
|
||||
use std::sync::{Once, ONCE_INIT};
|
||||
|
||||
|
@ -107,8 +107,8 @@ mod tests {
|
|||
|
||||
use self::bincode::serialize;
|
||||
use super::*;
|
||||
use solana_program_interface::account::{create_keyed_accounts, Account};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::{create_keyed_accounts, Account};
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::fs::File;
|
||||
use std::io::prelude::*;
|
||||
use std::path::PathBuf;
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
[package]
|
||||
name = "noop"
|
||||
name = "solana-noop"
|
||||
version = "0.10.0"
|
||||
description = "Solana noop program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
solana_program_interface = { path = "../../../common", version = "0.10.0" }
|
||||
solana-sdk = { path = "../../../common", version = "0.10.0" }
|
||||
|
||||
[lib]
|
||||
name = "noop"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use solana_program_interface::account::KeyedAccount;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn process(keyed_accounts: &mut [KeyedAccount], data: &[u8]) -> bool {
|
||||
|
|
|
@ -65,11 +65,11 @@ for Cargo_toml in $(find . -name Cargo.toml); do
|
|||
sed -i "$Cargo_toml" -e "s/^version = \"[^\"]*\"$/version = \"$newVersion\"/"
|
||||
)
|
||||
|
||||
# Fix up the internal references to the solana_program_interface crate
|
||||
# Fix up the internal references to the solana_sdk crate
|
||||
(
|
||||
set -x
|
||||
sed -i "$Cargo_toml" -e "
|
||||
s/^solana_program_interface.*\(\"[^\"]*common\"\).*\$/solana_program_interface = \{ path = \1, version = \"$newVersion\" \}/
|
||||
s/^solana-sdk.*\(\"[^\"]*common\"\).*\$/solana-sdk = \{ path = \1, version = \"$newVersion\" \}/
|
||||
"
|
||||
)
|
||||
done
|
||||
|
|
|
@ -24,8 +24,8 @@ use rayon::prelude::*;
|
|||
use rpc::RpcSignatureStatus;
|
||||
use signature::Keypair;
|
||||
use signature::Signature;
|
||||
use solana_program_interface::account::{Account, KeyedAccount};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::{Account, KeyedAccount};
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use std::collections::{BTreeMap, HashMap, HashSet};
|
||||
use std::result;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
//! BPF loader
|
||||
use native_loader;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
|
||||
pub const BPF_LOADER_PROGRAM_ID: [u8; 32] = [6u8; 32];
|
||||
pub const BPF_LOADER_NAME: &str = "bpf_loader";
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
use chrono::prelude::*;
|
||||
use payment_plan::{Payment, Witness};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::mem;
|
||||
|
||||
/// A data type representing a `Witness` that the payment plan is waiting on.
|
||||
|
|
|
@ -4,8 +4,8 @@ use budget::Budget;
|
|||
use budget_instruction::Instruction;
|
||||
use chrono::prelude::{DateTime, Utc};
|
||||
use payment_plan::Witness;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::io;
|
||||
use transaction::Transaction;
|
||||
|
||||
|
@ -259,8 +259,8 @@ mod test {
|
|||
use chrono::prelude::{DateTime, NaiveDate, Utc};
|
||||
use hash::Hash;
|
||||
use signature::{GenKeys, Keypair, KeypairUtil};
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use transaction::Transaction;
|
||||
|
||||
fn process_transaction(tx: &Transaction, accounts: &mut [Account]) -> Result<(), BudgetError> {
|
||||
|
|
|
@ -8,7 +8,7 @@ use chrono::prelude::*;
|
|||
use hash::Hash;
|
||||
use payment_plan::Payment;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use system_program::SystemProgram;
|
||||
use transaction::{self, Transaction};
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ use cluster_info::{ClusterInfoError, NodeInfo};
|
|||
use rand::distributions::{Distribution, Weighted, WeightedChoice};
|
||||
use rand::thread_rng;
|
||||
use result::Result;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
@ -193,7 +193,7 @@ mod tests {
|
|||
use choose_gossip_peer_strategy::{ChooseWeightedPeerStrategy, DEFAULT_WEIGHT};
|
||||
use logger;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ use rand::{thread_rng, Rng};
|
|||
use rayon::prelude::*;
|
||||
use result::{Error, Result};
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use std::collections::HashMap;
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
|
||||
|
@ -1400,7 +1400,7 @@ mod tests {
|
|||
use packet::SharedBlob;
|
||||
use result::Error;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::fs::remove_dir_all;
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
|
|
|
@ -9,7 +9,7 @@ use bytes::Bytes;
|
|||
use influx_db_client as influxdb;
|
||||
use metrics;
|
||||
use signature::{Keypair, Signature};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::io;
|
||||
use std::io::{Error, ErrorKind};
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
|
||||
|
|
|
@ -6,7 +6,7 @@ use bincode::{serialize_into, serialized_size};
|
|||
use hash::Hash;
|
||||
use packet::{SharedBlob, BLOB_DATA_SIZE};
|
||||
use poh::Poh;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::io::Cursor;
|
||||
use std::mem::size_of;
|
||||
use std::net::SocketAddr;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Support erasure coding
|
||||
use packet::{SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::cmp;
|
||||
use std::mem;
|
||||
use std::result;
|
||||
|
@ -597,7 +597,7 @@ mod test {
|
|||
use packet::{SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE, BLOB_SIZE};
|
||||
use rand::{thread_rng, Rng};
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
// use std::sync::{Arc, RwLock};
|
||||
use window::{index_blobs, WindowSlot};
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@ use hash::{hash, Hash};
|
|||
use ledger::create_ticks;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
#[cfg(test)]
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::collections::HashMap;
|
||||
use std::io::Cursor;
|
||||
use system_transaction::SystemTransaction;
|
||||
|
@ -538,7 +538,7 @@ mod tests {
|
|||
};
|
||||
use mint::Mint;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::collections::HashSet;
|
||||
use std::hash::Hash;
|
||||
use std::iter::FromIterator;
|
||||
|
|
|
@ -17,7 +17,7 @@ use packet::{SharedBlob, BLOB_DATA_SIZE};
|
|||
use rayon::prelude::*;
|
||||
use result::{Error, Result};
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::fs::{create_dir_all, remove_dir_all, File, OpenOptions};
|
||||
use std::io::prelude::*;
|
||||
use std::io::{self, BufReader, BufWriter, Seek, SeekFrom};
|
||||
|
|
|
@ -121,7 +121,7 @@ extern crate solana_jsonrpc_http_server as jsonrpc_http_server;
|
|||
extern crate solana_jsonrpc_macros as jsonrpc_macros;
|
||||
extern crate solana_jsonrpc_pubsub as jsonrpc_pubsub;
|
||||
extern crate solana_jsonrpc_ws_server as jsonrpc_ws_server;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
extern crate sys_info;
|
||||
extern crate tokio;
|
||||
extern crate tokio_codec;
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
use bincode::serialize;
|
||||
use hash::Hash;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::loader_instruction::LoaderInstruction;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::loader_instruction::LoaderInstruction;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use transaction::Transaction;
|
||||
|
||||
pub trait LoaderTransaction {
|
||||
|
|
|
@ -4,7 +4,7 @@ use entry::Entry;
|
|||
use hash::{hash, Hash};
|
||||
use ring::rand::SystemRandom;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use system_transaction::SystemTransaction;
|
||||
use transaction::Transaction;
|
||||
use untrusted::Input;
|
||||
|
|
|
@ -5,9 +5,9 @@ use libc;
|
|||
use libloading::os::unix::*;
|
||||
#[cfg(windows)]
|
||||
use libloading::os::windows::*;
|
||||
use solana_program_interface::account::KeyedAccount;
|
||||
use solana_program_interface::loader_instruction::LoaderInstruction;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::KeyedAccount;
|
||||
use solana_sdk::loader_instruction::LoaderInstruction;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
use std::str;
|
||||
|
|
|
@ -12,7 +12,7 @@ use log::Level;
|
|||
use recvmmsg::{recv_mmsg, NUM_RCVMMSGS};
|
||||
use result::{Error, Result};
|
||||
use serde::Serialize;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::fmt;
|
||||
use std::io;
|
||||
use std::mem::size_of;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
//! `Payment`, the payment is executed.
|
||||
|
||||
use chrono::prelude::*;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
|
||||
/// The types of events a payment plan can process.
|
||||
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
use hash::Hash;
|
||||
use signature::Signature;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
|
||||
#[cfg_attr(feature = "cargo-clippy", allow(large_enum_variant))]
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
|
||||
|
|
|
@ -10,8 +10,8 @@ use jsonrpc_http_server::*;
|
|||
use packet::PACKET_DATA_SIZE;
|
||||
use service::Service;
|
||||
use signature::Signature;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::mem;
|
||||
use std::net::{SocketAddr, UdpSocket};
|
||||
use std::result;
|
||||
|
|
|
@ -10,8 +10,8 @@ use jsonrpc_ws_server::{RequestContext, Sender, ServerBuilder};
|
|||
use rpc::{JsonRpcRequestProcessor, RpcSignatureStatus};
|
||||
use service::Service;
|
||||
use signature::{Keypair, KeypairUtil, Signature};
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::collections::HashMap;
|
||||
use std::mem;
|
||||
use std::net::SocketAddr;
|
||||
|
|
|
@ -8,7 +8,7 @@ use rayon::prelude::*;
|
|||
use ring::signature::Ed25519KeyPair;
|
||||
use ring::{rand, signature};
|
||||
use serde_json;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::error;
|
||||
use std::fmt;
|
||||
use std::fs::File;
|
||||
|
|
|
@ -61,7 +61,7 @@ pub fn init() {
|
|||
fn verify_packet(packet: &Packet) -> u8 {
|
||||
use ring::signature;
|
||||
use signature::Signature;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use untrusted;
|
||||
|
||||
let msg_start = TX_OFFSET + SIGNED_DATA_OFFSET;
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
use bincode::deserialize;
|
||||
use hash::Hash;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use transaction::Transaction;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
//! system program
|
||||
|
||||
use bincode::deserialize;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use transaction::Transaction;
|
||||
|
||||
|
@ -123,8 +123,8 @@ mod test {
|
|||
use super::*;
|
||||
use hash::Hash;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use system_program::SystemProgram;
|
||||
use system_transaction::SystemTransaction;
|
||||
use transaction::Transaction;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use bincode::serialize;
|
||||
use hash::Hash;
|
||||
use signature::{Keypair, KeypairUtil};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use system_program::SystemProgram;
|
||||
use transaction::{Instruction, Transaction};
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@ use ncp::Ncp;
|
|||
use request::{Request, Response};
|
||||
use result::{Error, Result};
|
||||
use signature::{Keypair, Signature};
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use std::collections::HashMap;
|
||||
use std::io;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
//! tic-tac-toe dashboard program
|
||||
|
||||
use serde_cbor;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use tictactoe_program::{Error, Game, Result, State, TicTacToeProgram};
|
||||
use transaction::Transaction;
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
//! tic-tac-toe program
|
||||
|
||||
use serde_cbor;
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use transaction::Transaction;
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
use bincode;
|
||||
|
||||
use solana_program_interface::account::Account;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std;
|
||||
use transaction::Transaction;
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use bincode::serialize;
|
||||
use hash::{Hash, Hasher};
|
||||
use signature::{Keypair, KeypairUtil, Signature};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::mem::size_of;
|
||||
|
||||
pub const SIGNED_DATA_OFFSET: usize = size_of::<Signature>();
|
||||
|
|
|
@ -12,7 +12,7 @@ use metrics;
|
|||
use packet::SharedBlob;
|
||||
use result::Result;
|
||||
use signature::Keypair;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::result;
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::{Arc, RwLock};
|
||||
|
|
|
@ -17,7 +17,7 @@ use rpc::RpcSignatureStatus;
|
|||
use rpc_request::RpcRequest;
|
||||
use serde_json;
|
||||
use signature::{Keypair, KeypairUtil, Signature};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::fs::{self, File};
|
||||
use std::io::prelude::*;
|
||||
use std::io::{Error, ErrorKind, Write};
|
||||
|
|
|
@ -10,7 +10,7 @@ use ledger::{reconstruct_entries_from_blobs, Block};
|
|||
use log::Level;
|
||||
use packet::SharedBlob;
|
||||
use result::Result;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::cmp;
|
||||
use std::mem;
|
||||
use std::net::SocketAddr;
|
||||
|
@ -459,7 +459,7 @@ pub fn new_window_from_entries(
|
|||
#[cfg(test)]
|
||||
mod test {
|
||||
use packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::io;
|
||||
use std::io::Write;
|
||||
use std::net::UdpSocket;
|
||||
|
|
|
@ -10,7 +10,7 @@ use metrics;
|
|||
use packet::SharedBlob;
|
||||
use rand::{thread_rng, Rng};
|
||||
use result::{Error, Result};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::net::UdpSocket;
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
||||
use std::sync::mpsc::RecvTimeoutError;
|
||||
|
|
|
@ -4,7 +4,7 @@ extern crate bincode;
|
|||
extern crate chrono;
|
||||
extern crate serde_json;
|
||||
extern crate solana;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use solana::cluster_info::{ClusterInfo, Node, NodeInfo};
|
||||
use solana::entry::Entry;
|
||||
|
@ -25,7 +25,7 @@ use solana::thin_client::ThinClient;
|
|||
use solana::timing::{duration_as_ms, duration_as_s};
|
||||
use solana::transaction::Transaction;
|
||||
use solana::window::{default_window, WINDOW_SIZE};
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::collections::{HashSet, VecDeque};
|
||||
use std::env;
|
||||
use std::fs::{copy, create_dir_all, remove_dir_all};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
extern crate bincode;
|
||||
extern crate elf;
|
||||
extern crate solana;
|
||||
extern crate solana_program_interface;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use bincode::serialize;
|
||||
use solana::bank::Bank;
|
||||
|
@ -16,7 +16,7 @@ use solana::system_transaction::SystemTransaction;
|
|||
#[cfg(feature = "bpf_c")]
|
||||
use solana::tictactoe_program::Command;
|
||||
use solana::transaction::Transaction;
|
||||
use solana_program_interface::pubkey::Pubkey;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
#[cfg(feature = "bpf_c")]
|
||||
use std::env;
|
||||
#[cfg(feature = "bpf_c")]
|
||||
|
|
Loading…
Reference in New Issue