[sdk] remove json-rpc

remove json-rpc and the resharing of client
GS- · Mar 1, 2022 · 2162cff · 2162cff
1 parent 63e339d
commit 2162cff
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 957 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -86,7 +86,6 @@ members = [
     "network/netcore",
     "network/socket-bench-server",
     "sdk",
-    "sdk/compatibility",
     "sdk/offchain",
     "sdk/transaction-builder",
     "secure/net",

diff --git a/api/src/tests/transactions_test.rs b/api/src/tests/transactions_test.rs
@@ -9,14 +9,14 @@ use diem_crypto::{
     multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey},
     SigningKey, Uniform,
 };
-use diem_sdk::{client::SignedTransaction, transaction_builder::Currency, types::LocalAccount};
+use diem_sdk::{transaction_builder::Currency, types::LocalAccount};
 use diem_types::{
     access_path::{AccessPath, Path},
     account_address::AccountAddress,
     account_config::{from_currency_code_string, xus_tag, XUS_NAME},
     transaction::{
         authenticator::{AuthenticationKey, TransactionAuthenticator},
-        ChangeSet, Script, ScriptFunction, Transaction,
+        ChangeSet, Script, ScriptFunction, SignedTransaction, Transaction,
     },
     write_set::{WriteOp, WriteSetMut},
 };

diff --git a/crates/transaction-emitter/src/lib.rs b/crates/transaction-emitter/src/lib.rs
@@ -3,9 +3,8 @@
 
 use anyhow::{format_err, Context, Result};
 use diem_logger::*;
-use diem_rest_client::{Client as RestClient, PendingTransaction, Response};
+use diem_rest_client::{views::AmountView, Client as RestClient, PendingTransaction, Response};
 use diem_sdk::{
-    client::views::AmountView,
     move_types::account_address::AccountAddress,
     transaction_builder::{Currency, TransactionFactory},
     types::{

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -9,10 +9,6 @@ license = "Apache-2.0"
 publish = ["crates-io"]
 edition = "2018"
 
-[features]
-default = ["client"]
-client = ["diem-client"]
-
 [dependencies]
 bcs = "0.1"
 rand_core = "0.6.2"
@@ -23,6 +19,3 @@ diem-types = { path = "../types", version = "0.0.3"}
 move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860", version = "0.0.3" }
 diem-transaction-builder = { path = "./transaction-builder", version = "0.0.3" }
 diem-workspace-hack = { version = "0.1", path = "../crates/diem-workspace-hack" }
-
-# Optional Dependencies
-diem-client = { path = "../crates/diem-client", version = "0.0.3", optional = true }
diff --git a/sdk/compatibility/Cargo.toml b/sdk/compatibility/Cargo.toml
diff --git a/sdk/compatibility/src/env.rs b/sdk/compatibility/src/env.rs