Rename client-common to rpc-client-api

solana-labs · Aug 22, 2022 · 4d50398 · 4d50398
1 parent d08f9a3
commit 4d50398
Show file tree

Hide file tree

Showing 38 changed files with 237 additions and 236 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,6 @@ members = [
     "cli-config",
     "cli-output",
     "client",
-    "client-common",
     "client-test",
     "core",
     "dos",
@@ -66,6 +65,7 @@ members = [
     "remote-wallet",
     "rpc",
     "rpc-client",
+    "rpc-client-api",
     "rpc-test",
     "runtime",
     "runtime/store-tool",

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -11,11 +11,11 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.17"
-solana-client-common = { path = "../client-common", version = "=1.12.0" }
 solana-measure = { path = "../measure", version = "=1.12.0" }
 solana-nonce-client = { path = "../nonce-client", version = "=1.12.0" }
 solana-pubsub-client = { path = "../pubsub-client", version = "=1.12.0" }
 solana-rpc-client = { path = "../rpc-client", version = "=1.12.0" }
+solana-rpc-client-api = { path = "../rpc-client-api", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-thin-client = { path = "../thin-client", version = "=1.12.0" }
 solana-tpu-client = { path = "../tpu-client", version = "=1.12.0" }

diff --git a/client/src/client_error.rs b/client/src/client_error.rs
@@ -1 +1 @@
-pub use solana_client_common::client_error::*;
+pub use solana_rpc_client_api::client_error::*;
diff --git a/client/src/rpc_config.rs b/client/src/rpc_config.rs
@@ -1 +1 @@
-pub use solana_client_common::rpc_config::*;
+pub use solana_rpc_client_api::rpc_config::*;
diff --git a/client/src/rpc_custom_error.rs b/client/src/rpc_custom_error.rs
@@ -1,2 +1,2 @@
 //! Implementation defined RPC server errors
-pub use solana_client_common::rpc_custom_error::*;
+pub use solana_rpc_client_api::rpc_custom_error::*;
diff --git a/client/src/rpc_deprecated_config.rs b/client/src/rpc_deprecated_config.rs
@@ -1 +1 @@
-pub use solana_client_common::rpc_deprecated_config::*;
+pub use solana_rpc_client_api::rpc_deprecated_config::*;
diff --git a/client/src/rpc_filter.rs b/client/src/rpc_filter.rs
@@ -1 +1 @@
-pub use solana_client_common::rpc_filter::*;
+pub use solana_rpc_client_api::rpc_filter::*;
diff --git a/client/src/rpc_request.rs b/client/src/rpc_request.rs
@@ -1 +1 @@
-pub use solana_client_common::rpc_request::*;
+pub use solana_rpc_client_api::rpc_request::*;
diff --git a/client/src/rpc_response.rs b/client/src/rpc_response.rs
@@ -1 +1 @@
-pub use solana_client_common::rpc_response::*;
+pub use solana_rpc_client_api::rpc_response::*;
diff --git a/nonce-client/Cargo.toml b/nonce-client/Cargo.toml
@@ -21,7 +21,7 @@ anyhow = "1.0.58"
 futures = "0.3"
 serde_json = "1.0.83"
 solana-account-decoder = { path = "../account-decoder", version = "=1.12.0" }
-solana-client-common = { path = "../client-common", version = "=1.12.0" }
+solana-rpc-client-api = { path = "../rpc-client-api", version = "=1.12.0" }
 tokio = { version = "1", features = ["full"] }
 
 [package.metadata.docs.rs]

diff --git a/nonce-client/src/blockhash_query.rs b/nonce-client/src/blockhash_query.rs
@@ -190,7 +190,7 @@ mod tests {
         clap::App,
         serde_json::{self, json},
         solana_account_decoder::{UiAccount, UiAccountEncoding},
-        solana_client_common::{
+        solana_rpc_client_api::{
             rpc_request::RpcRequest,
             rpc_response::{Response, RpcFeeCalculator, RpcFees, RpcResponseContext},
         },

diff --git a/nonce-client/src/nonblocking/blockhash_query.rs b/nonce-client/src/nonblocking/blockhash_query.rs
@@ -120,7 +120,7 @@ mod tests {
         clap::App,
         serde_json::{self, json},
         solana_account_decoder::{UiAccount, UiAccountEncoding},
-        solana_client_common::{
+        solana_rpc_client_api::{
             rpc_request::RpcRequest,
             rpc_response::{Response, RpcBlockhash, RpcResponseContext},
         },

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/pubsub-client/Cargo.toml b/pubsub-client/Cargo.toml
@@ -19,7 +19,7 @@ serde = "1.0.143"
 serde_derive = "1.0.103"
 serde_json = "1.0.83"
 solana-account-decoder = { path = "../account-decoder", version = "=1.12.0" }
-solana-client-common = { path = "../client-common", version = "=1.12.0" }
+solana-rpc-client-api = { path = "../rpc-client-api", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }

diff --git a/pubsub-client/src/nonblocking/pubsub_client.rs b/pubsub-client/src/nonblocking/pubsub_client.rs
@@ -8,7 +8,7 @@ use {
     serde::de::DeserializeOwned,
     serde_json::{json, Map, Value},
     solana_account_decoder::UiAccount,
-    solana_client_common::{
+    solana_rpc_client_api::{
         rpc_config::{
             RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter,
             RpcProgramAccountsConfig, RpcSignatureSubscribeConfig, RpcTransactionLogsConfig,

diff --git a/pubsub-client/src/pubsub_client.rs b/pubsub-client/src/pubsub_client.rs
@@ -9,7 +9,7 @@ use {
         Map, Value,
     },
     solana_account_decoder::UiAccount,
-    solana_client_common::{
+    solana_rpc_client_api::{
         rpc_config::{
             RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter,
             RpcProgramAccountsConfig, RpcSignatureSubscribeConfig, RpcTransactionLogsConfig,

diff --git a/client-common/Cargo.toml → rpc-client-api/Cargo.toml b/client-common/Cargo.toml → rpc-client-api/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "solana-client-common"
+name = "solana-rpc-client-api"
 version = "1.12.0"
 description = "Solana Client Common Utilities"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-client-common"
+documentation = "https://docs.rs/solana-rpc-client-api"
 edition = "2021"
 
 [dependencies]

diff --git a/client-common/src/client_error.rs → rpc-client-api/src/client_error.rs b/client-common/src/client_error.rs → rpc-client-api/src/client_error.rs
diff --git a/client-common/src/lib.rs → rpc-client-api/src/lib.rs b/client-common/src/lib.rs → rpc-client-api/src/lib.rs
diff --git a/client-common/src/rpc_config.rs → rpc-client-api/src/rpc_config.rs b/client-common/src/rpc_config.rs → rpc-client-api/src/rpc_config.rs
diff --git a/client-common/src/rpc_custom_error.rs → rpc-client-api/src/rpc_custom_error.rs b/client-common/src/rpc_custom_error.rs → rpc-client-api/src/rpc_custom_error.rs
diff --git a/client-common/src/rpc_deprecated_config.rs → rpc-client-api/src/rpc_deprecated_config.rs b/client-common/src/rpc_deprecated_config.rs → rpc-client-api/src/rpc_deprecated_config.rs
diff --git a/client-common/src/rpc_error_object.rs → rpc-client-api/src/rpc_error_object.rs b/client-common/src/rpc_error_object.rs → rpc-client-api/src/rpc_error_object.rs
diff --git a/client-common/src/rpc_filter.rs → rpc-client-api/src/rpc_filter.rs b/client-common/src/rpc_filter.rs → rpc-client-api/src/rpc_filter.rs
diff --git a/client-common/src/rpc_request.rs → rpc-client-api/src/rpc_request.rs b/client-common/src/rpc_request.rs → rpc-client-api/src/rpc_request.rs
diff --git a/client-common/src/rpc_response.rs → rpc-client-api/src/rpc_response.rs b/client-common/src/rpc_response.rs → rpc-client-api/src/rpc_response.rs
diff --git a/rpc-client/Cargo.toml b/rpc-client/Cargo.toml
@@ -22,7 +22,7 @@ serde = "1.0.143"
 serde_derive = "1.0.103"
 serde_json = "1.0.83"
 solana-account-decoder = { path = "../account-decoder", version = "=1.12.0" }
-solana-client-common = { path = "../client-common", version = "=1.12.0" }
+solana-rpc-client-api = { path = "../rpc-client-api", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.12.0" }
 solana-version = { path = "../version", version = "=1.12.0" }

diff --git a/rpc-client/src/http_sender.rs b/rpc-client/src/http_sender.rs
@@ -9,7 +9,7 @@ use {
         header::{self, CONTENT_TYPE, RETRY_AFTER},
         StatusCode,
     },
-    solana_client_common::{
+    solana_rpc_client_api::{
         client_error::Result,
         rpc_custom_error,
         rpc_error_object::RpcErrorObject,

diff --git a/rpc-client/src/mock_sender.rs b/rpc-client/src/mock_sender.rs
@@ -5,7 +5,7 @@ use {
     async_trait::async_trait,
     serde_json::{json, Number, Value},
     solana_account_decoder::{UiAccount, UiAccountEncoding},
-    solana_client_common::{
+    solana_rpc_client_api::{
         client_error::Result,
         rpc_config::RpcBlockProductionConfig,
         rpc_request::RpcRequest,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::client_error::*;
		pub use solana_rpc_client_api::client_error::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::rpc_config::*;
		pub use solana_rpc_client_api::rpc_config::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::rpc_deprecated_config::*;
		pub use solana_rpc_client_api::rpc_deprecated_config::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::rpc_filter::*;
		pub use solana_rpc_client_api::rpc_filter::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::rpc_request::*;
		pub use solana_rpc_client_api::rpc_request::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use solana_client_common::rpc_response::*;
		pub use solana_rpc_client_api::rpc_response::*;