open-rpc: move open-rpc crates into the crates directory

blcozgn · May 23, 2022 · e7627a6 · e7627a6
1 parent 9fd648f
commit e7627a6
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,8 +13,8 @@ members = [
     "crates/sui-verifier-transactional-tests",
     "crates/x",
     "sui",
-    "sui/open_rpc",
-    "sui/open_rpc/macros",
+    "crates/sui-open-rpc",
+    "crates/sui-open-rpc-macros",
     "sui_core",
     "sui_programmability/framework",
     "sui_storage",

diff --git a/sui/open_rpc/macros/Cargo.toml → crates/sui-open-rpc-macros/Cargo.toml b/sui/open_rpc/macros/Cargo.toml → crates/sui-open-rpc-macros/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0", features = ["full"] }
+syn = { version = "1.0", features = ["full", "extra-traits"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 itertools = "0.10.3"
-derive-syn-parse = "0.1.5"
+derive-syn-parse = "0.1.5"
diff --git a/sui/open_rpc/macros/src/lib.rs → crates/sui-open-rpc-macros/src/lib.rs b/sui/open_rpc/macros/src/lib.rs → crates/sui-open-rpc-macros/src/lib.rs
diff --git a/sui/open_rpc/Cargo.toml → crates/sui-open-rpc/Cargo.toml b/sui/open_rpc/Cargo.toml → crates/sui-open-rpc/Cargo.toml
diff --git a/sui/open_rpc/samples/objects.json → crates/sui-open-rpc/samples/objects.json b/sui/open_rpc/samples/objects.json → crates/sui-open-rpc/samples/objects.json
diff --git a/sui/open_rpc/samples/transactions.json → ...es/sui-open-rpc/samples/transactions.json b/sui/open_rpc/samples/transactions.json → ...es/sui-open-rpc/samples/transactions.json
diff --git a/sui/open_rpc/spec/openrpc.json → crates/sui-open-rpc/spec/openrpc.json b/sui/open_rpc/spec/openrpc.json → crates/sui-open-rpc/spec/openrpc.json
diff --git a/sui/open_rpc/src/lib.rs → crates/sui-open-rpc/src/lib.rs b/sui/open_rpc/src/lib.rs → crates/sui-open-rpc/src/lib.rs
diff --git a/sui/Cargo.toml b/sui/Cargo.toml
@@ -46,8 +46,8 @@ sui-network = { path = "../crates/sui-network" }
 sui-config = { path = "../crates/sui-config" }
 sui-types = { path = "../crates/sui-types" }
 sui-verifier = { path = "../crates/sui-verifier" }
-sui-open-rpc = { path = "open_rpc" }
-sui-open-rpc-macros = { path = "open_rpc/macros" }
+sui-open-rpc = { path = "../crates/sui-open-rpc" }
+sui-open-rpc-macros = { path = "../crates/sui-open-rpc-macros" }
 sui-json = { path = "../crates/sui-json" }
 
 rustyline = "9.1.2"

diff --git a/sui/src/generate_json_rpc_spec.rs b/sui/src/generate_json_rpc_spec.rs
@@ -1,8 +1,6 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-extern crate core;
-
 use std::fs::File;
 use std::io::Write;
 
@@ -19,6 +17,7 @@ use sui::wallet_commands::{EXAMPLE_NFT_DESCRIPTION, EXAMPLE_NFT_NAME, EXAMPLE_NF
 use sui_core::gateway_types::{
     GetObjectInfoResponse, SuiObjectRef, TransactionEffectsResponse, TransactionResponse,
 };
+use sui_gateway::api::RpcGatewayOpenRpc;
 use sui_json::SuiJsonValue;
 use sui_types::base_types::{ObjectID, SuiAddress};
 use sui_types::SUI_FRAMEWORK_ADDRESS;
@@ -41,9 +40,9 @@ struct Options {
     action: Action,
 }
 
-const FILE_PATH: &str = "sui/open_rpc/spec/openrpc.json";
-const OBJECT_SAMPLE_FILE_PATH: &str = "sui/open_rpc/samples/objects.json";
-const TRANSACTION_SAMPLE_FILE_PATH: &str = "sui/open_rpc/samples/transactions.json";
+const FILE_PATH: &str = "crates/sui-open-rpc/spec/openrpc.json";
+const OBJECT_SAMPLE_FILE_PATH: &str = "crates/sui-open-rpc/samples/objects.json";
+const TRANSACTION_SAMPLE_FILE_PATH: &str = "crates/sui-open-rpc/samples/transactions.json";
 
 #[tokio::main]
 async fn main() {