Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: rename internal jsonrpc-client crate #12925

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: rename internal jsonrpc-client crate #12925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ near-indexer = { path = "chain/indexer" }
near-indexer-primitives = { path = "chain/indexer-primitives" }
near-jsonrpc = { path = "chain/jsonrpc" }
near-jsonrpc-adversarial-primitives = { path = "chain/jsonrpc-adversarial-primitives" }
near-jsonrpc-client = { path = "chain/jsonrpc/client" }
near-jsonrpc-client-internal = { path = "chain/jsonrpc/client" }
near-jsonrpc-primitives = { path = "chain/jsonrpc-primitives", features = [
"full",
] }
Expand Down
11 changes: 4 additions & 7 deletions chain/jsonrpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ near-primitives.workspace = true
near-client.workspace = true
near-network.workspace = true
near-o11y.workspace = true
near-jsonrpc-client.workspace = true
near-jsonrpc-client-internal.workspace = true
near-jsonrpc-primitives.workspace = true
near-jsonrpc-adversarial-primitives = { workspace = true, optional = true }

Expand All @@ -52,7 +52,7 @@ nightly = [
"near-client-primitives/nightly",
"near-client/nightly",
"near-jsonrpc-adversarial-primitives/nightly",
"near-jsonrpc-client/nightly",
"near-jsonrpc-client-internal/nightly",
"near-jsonrpc-primitives/nightly",
"near-network/nightly",
"near-o11y/nightly",
Expand All @@ -65,13 +65,10 @@ nightly_protocol = [
"near-client-primitives/nightly_protocol",
"near-client/nightly_protocol",
"near-jsonrpc-adversarial-primitives/nightly_protocol",
"near-jsonrpc-client/nightly_protocol",
"near-jsonrpc-client-internal/nightly_protocol",
"near-jsonrpc-primitives/nightly_protocol",
"near-network/nightly_protocol",
"near-o11y/nightly_protocol",
"near-primitives/nightly_protocol",
]
sandbox = [
"near-client/sandbox",
"near-o11y/sandbox",
]
sandbox = ["near-client/sandbox", "near-o11y/sandbox"]
2 changes: 1 addition & 1 deletion chain/jsonrpc/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "near-jsonrpc-client"
name = "near-jsonrpc-client-internal"
version.workspace = true
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use near_client::{
ProcessTxRequest, ProcessTxResponse, Query, Status, TxStatus,
};
use near_client_primitives::types::GetSplitStorageInfo;
pub use near_jsonrpc_client as client;
pub use near_jsonrpc_client_internal as client;
pub use near_jsonrpc_primitives as primitives;
use near_jsonrpc_primitives::errors::{RpcError, RpcErrorKind};
use near_jsonrpc_primitives::message::{Message, Request};
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ near-crypto.workspace = true
near-epoch-manager.workspace = true
near-fmt.workspace = true
near-jsonrpc.workspace = true
near-jsonrpc-client.workspace = true
near-jsonrpc-client-internal.workspace = true
near-jsonrpc-primitives.workspace = true
near-network.workspace = true
near-parameters.workspace = true
Expand Down Expand Up @@ -105,7 +105,7 @@ nightly = [
"near-client/nightly",
"near-epoch-manager/nightly",
"near-fmt/nightly",
"near-jsonrpc-client/nightly",
"near-jsonrpc-client-internal/nightly",
"near-jsonrpc-primitives/nightly",
"near-jsonrpc/nightly",
"near-network/nightly",
Expand Down Expand Up @@ -134,7 +134,7 @@ nightly_protocol = [
"near-client/nightly_protocol",
"near-epoch-manager/nightly_protocol",
"near-fmt/nightly_protocol",
"near-jsonrpc-client/nightly_protocol",
"near-jsonrpc-client-internal/nightly_protocol",
"near-jsonrpc-primitives/nightly_protocol",
"near-jsonrpc/nightly_protocol",
"near-network/nightly_protocol",
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/node/process_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::node::Node;
use crate::user::rpc_user::RpcUser;
use crate::user::User;
use actix::System;
use near_jsonrpc_client::new_client;
use near_jsonrpc_client_internal::new_client;
use near_network::test_utils::wait_or_timeout;

pub enum ProcessNodeState {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/user/rpc_user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use futures::{Future, TryFutureExt};
use near_client::StatusResponse;
use near_crypto::{PublicKey, Signer};
use near_jsonrpc::client::{new_client, JsonRpcClient};
use near_jsonrpc_client::ChunkId;
use near_jsonrpc_client_internal::ChunkId;
use near_jsonrpc_primitives::errors::ServerError;
use near_jsonrpc_primitives::types::query::{QueryResponseKind, RpcQueryRequest, RpcQueryResponse};
use near_jsonrpc_primitives::types::transactions::{RpcTransactionStatusRequest, TransactionInfo};
Expand Down
6 changes: 3 additions & 3 deletions tools/mirror/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ near-chain-primitives.workspace = true
near-client.workspace = true
near-client-primitives.workspace = true
near-epoch-manager.workspace = true
near-jsonrpc-client.workspace = true
near-jsonrpc-client-internal.workspace = true
near-jsonrpc-primitives.workspace = true
near-indexer-primitives.workspace = true
near-indexer.workspace = true
Expand All @@ -63,7 +63,7 @@ nightly = [
"near-epoch-manager/nightly",
"near-indexer-primitives/nightly",
"near-indexer/nightly",
"near-jsonrpc-client/nightly",
"near-jsonrpc-client-internal/nightly",
"near-jsonrpc-primitives/nightly",
"near-network/nightly",
"near-o11y/nightly",
Expand All @@ -82,7 +82,7 @@ nightly_protocol = [
"near-epoch-manager/nightly_protocol",
"near-indexer-primitives/nightly_protocol",
"near-indexer/nightly_protocol",
"near-jsonrpc-client/nightly_protocol",
"near-jsonrpc-client-internal/nightly_protocol",
"near-jsonrpc-primitives/nightly_protocol",
"near-network/nightly_protocol",
"near-o11y/nightly_protocol",
Expand Down
2 changes: 1 addition & 1 deletion tools/mirror/src/key_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub(crate) async fn keys_from_rpc(
) -> anyhow::Result<Vec<SecretAccessKey>> {
let account_id: AccountId = account_id.parse().context("bad account ID")?;

let rpc_client = near_jsonrpc_client::new_client(rpc_url);
let rpc_client = near_jsonrpc_client_internal::new_client(rpc_url);

let block_reference = match block_height {
Some(h) => BlockReference::BlockId(BlockId::Height(h)),
Expand Down
2 changes: 1 addition & 1 deletion tools/mock-node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ near-crypto.workspace = true
near-chunks.workspace = true
near-epoch-manager.workspace = true
near-jsonrpc.workspace = true
near-jsonrpc-client.workspace = true
near-jsonrpc-client-internal.workspace = true
near-network.workspace = true
near-store.workspace = true
near-o11y.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion tools/restaked/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tokio.workspace = true
near-crypto.workspace = true
near-chain-configs.workspace = true
near-primitives.workspace = true
near-jsonrpc-client.workspace = true
near-jsonrpc-client-internal.workspace = true
nearcore.workspace = true
near-o11y.workspace = true

Expand Down
Loading