wallet/ now only dev-depends on core/

core/src/cluster_info.rs

@@ -21,7 +21,6 @@ use crate::crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS;
 use crate::crds_value::{CrdsValue, CrdsValueLabel, Vote};
 use crate::packet::{to_shared_blob, Blob, SharedBlob, BLOB_SIZE};
 use crate::result::Result;
-use crate::rpc_service::RPC_PORT;
 use crate::staking_utils;
 use crate::streamer::{BlobReceiver, BlobSender};
 use bincode::{deserialize, serialize};
@@ -35,6 +34,7 @@ use solana_netutil::{bind_in_range, bind_to, find_available_port_in_range, multi
 use solana_runtime::bloom::Bloom;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::rpc_port;
 use solana_sdk::signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::timing::{duration_as_ms, timestamp};
 use solana_sdk::transaction::Transaction;
@@ -1436,8 +1436,8 @@ impl Node {
             SocketAddr::new(gossip_addr.ip(), tpu_port),
             SocketAddr::new(gossip_addr.ip(), tpu_via_blobs_port),
             SocketAddr::new(gossip_addr.ip(), storage_port),
-            SocketAddr::new(gossip_addr.ip(), RPC_PORT),
-            SocketAddr::new(gossip_addr.ip(), RPC_PORT + 1),
+            SocketAddr::new(gossip_addr.ip(), rpc_port::DEFAULT_RPC_PORT),
+            SocketAddr::new(gossip_addr.ip(), rpc_port::DEFAULT_RPC_PUBSUB_PORT),
             0,
         );
         trace!("new ContactInfo: {:?}", info);

core/src/contact_info.rs

@@ -1,6 +1,6 @@
-use crate::rpc_service::RPC_PORT;
 use bincode::serialize;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::rpc_port;
 use solana_sdk::signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::timing::timestamp;
 use std::cmp::{Ord, Ordering, PartialEq, PartialOrd};
@@ -151,8 +151,8 @@ impl ContactInfo {
         let gossip_addr = Self::next_port(&bind_addr, 1);
         let tvu_addr = Self::next_port(&bind_addr, 2);
         let tpu_via_blobs_addr = Self::next_port(&bind_addr, 3);
-        let rpc_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT);
-        let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT + 1);
+        let rpc_addr = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PORT);
+        let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PUBSUB_PORT);
         Self::new(
             pubkey,
             gossip_addr,

core/src/lib.rs

@@ -56,7 +56,6 @@ pub mod rpc;
 pub mod rpc_pubsub;
 pub mod rpc_pubsub_service;
 pub mod rpc_service;
-pub mod rpc_status;
 pub mod rpc_subscriptions;
 pub mod service;
 pub mod sigverify;

core/src/rpc.rs

@@ -2,12 +2,12 @@
 
 use crate::cluster_info::ClusterInfo;
 use crate::packet::PACKET_DATA_SIZE;
-use crate::rpc_status::RpcSignatureStatus;
 use crate::storage_stage::StorageState;
 use bincode::{deserialize, serialize};
 use bs58;
 use jsonrpc_core::{Error, ErrorCode, Metadata, Result};
 use jsonrpc_derive::rpc;
+use solana_client::rpc_signature_status::RpcSignatureStatus;
 use solana_drone::drone::request_airdrop_transaction;
 use solana_runtime::bank::{self, Bank};
 use solana_sdk::account::Account;

core/src/rpc_pubsub.rs

@@ -1,12 +1,12 @@
 //! The `pubsub` module implements a threaded subscription service on client RPC request
 
-use crate::rpc_status::RpcSignatureStatus;
 use crate::rpc_subscriptions::RpcSubscriptions;
 use bs58;
 use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::typed::Subscriber;
 use jsonrpc_pubsub::{Session, SubscriptionId};
+use solana_client::rpc_signature_status::RpcSignatureStatus;
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Signature;

core/src/rpc_service.rs

@@ -13,8 +13,6 @@ use std::sync::{Arc, RwLock};
 use std::thread::{self, sleep, Builder, JoinHandle};
 use std::time::Duration;
 
-pub const RPC_PORT: u16 = 8899;
-
 pub struct JsonRpcService {
     thread_hdl: JoinHandle<()>,
     pub request_processor: Arc<RwLock<JsonRpcRequestProcessor>>, // Used only by tests...

core/src/rpc_status.rs

@@ -1,30 +0,0 @@
-//! The `rpc_status` module defines transaction status codes
-
-use jsonrpc_core::{Error, Result};
-use std::str::FromStr;
-
-#[derive(Copy, Clone, PartialEq, Serialize, Debug)]
-pub enum RpcSignatureStatus {
-    AccountInUse,
-    AccountLoadedTwice,
-    Confirmed,
-    GenericFailure,
-    ProgramRuntimeError,
-    SignatureNotFound,
-}
-
-impl FromStr for RpcSignatureStatus {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<RpcSignatureStatus> {
-        match s {
-            "AccountInUse" => Ok(RpcSignatureStatus::AccountInUse),
-            "AccountLoadedTwice" => Ok(RpcSignatureStatus::AccountLoadedTwice),
-            "Confirmed" => Ok(RpcSignatureStatus::Confirmed),
-            "GenericFailure" => Ok(RpcSignatureStatus::GenericFailure),
-            "ProgramRuntimeError" => Ok(RpcSignatureStatus::ProgramRuntimeError),
-            "SignatureNotFound" => Ok(RpcSignatureStatus::SignatureNotFound),
-            _ => Err(Error::parse_error()),
-        }
-    }
-}

core/src/rpc_subscriptions.rs

@@ -1,11 +1,11 @@
 //! The `pubsub` module implements a threaded subscription service on client RPC request
 
-use crate::rpc_status::RpcSignatureStatus;
 use bs58;
 use core::hash::Hash;
 use jsonrpc_core::futures::Future;
 use jsonrpc_pubsub::typed::Sink;
 use jsonrpc_pubsub::SubscriptionId;
+use solana_client::rpc_signature_status::RpcSignatureStatus;
 use solana_runtime::bank::{self, Bank};
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;