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

wallet/ now only dev-depends on core/

Browse Source
This commit is contained in:
Michael Vines
2019-03-16 17:43:39 -07:00
parent ad252fe4c5
commit e2c24481e4
15 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wallet/Cargo.toml
View File

@ -16,7 +16,6 @@ chrono = { version = "0.4.0", features = ["serde"] }
dirs = "1.0.5"
log = "0.4.2"
serde_json = "1.0.39"
solana = { path = "../core", version = "0.13.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.13.0" }
solana-client = { path = "../client", version = "0.13.0" }
solana-drone = { path = "../drone", version = "0.13.0" }
@ -27,6 +26,7 @@ solana-vote-signer = { path = "../vote-signer", version = "0.13.0" }
[dev-dependencies]
solana-budget-program = { path = "../programs/budget", version = "0.13.0" }
solana = { path = "../core", version = "0.13.0" }
[features]
cuda = ["solana/cuda"]

6
wallet/src/wallet.rs
View File

@ -5,8 +5,6 @@ use clap::ArgMatches;
use log::*;
use serde_json;
use serde_json::json;
use solana::rpc_service::RPC_PORT;
use solana::rpc_status::RpcSignatureStatus;
use solana_budget_api;
use solana_budget_api::budget_transaction::BudgetTransaction;
#[cfg(test)]
@ -14,6 +12,7 @@ use solana_client::rpc_mock::{request_airdrop_transaction, MockRpcClient as RpcC
#[cfg(not(test))]
use solana_client::rpc_request::RpcClient;
use solana_client::rpc_request::{get_rpc_request_str, RpcRequest};
use solana_client::rpc_signature_status::RpcSignatureStatus;
#[cfg(not(test))]
use solana_drone::drone::request_airdrop_transaction;
use solana_drone::drone::DRONE_PORT;
@ -21,6 +20,7 @@ use solana_sdk::bpf_loader;
use solana_sdk::hash::Hash;
use solana_sdk::loader_transaction::LoaderTransaction;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::rpc_port::DEFAULT_RPC_PORT;
use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
@ -111,7 +111,7 @@ impl Default for WalletConfig {
id: Keypair::new(),
rpc_client: None,
rpc_host: None,
rpc_port: RPC_PORT,
rpc_port: DEFAULT_RPC_PORT,
rpc_tls: false,
}
}