chore: filenames fastx -> sui

Cargo.toml

@@ -2,9 +2,9 @@
 members = [
         "sui_core",
         "sui",
-        "fastx_programmability/adapter",
-        "fastx_programmability/framework",
-	"fastx_types",
+        "sui_programmability/adapter",
+        "sui_programmability/framework",
+	"sui_types",
 ]
 
 [profile.release]

README.md

@@ -20,12 +20,12 @@ cargo build --release
 cd target/release
 ```
 
-This will create `fastx` and `wallet` binaries in `target/release` directory.
+This will create `sui` and `wallet` binaries in `target/release` directory.
 
 ### 2. Genesis
 
 ```shell
-./fastx genesis
+./sui genesis
 ```
 
 The genesis command creates 4 authorities, 5 user accounts each with 5 gas objects.
@@ -37,13 +37,13 @@ A `wallet.conf` will also be generated to be used by the `wallet` binary to mana
 Run the following command to start the local Sui network:
 
 ```shell
-./fastx start 
+./sui start 
 ```
 
 or
 
 ```shell
-./fastx start --config [config file path]
+./sui start --config [config file path]
 ```
 
 The network config file path is defaulted to `./network.conf` if not specified.  

network_utils/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "fastx-network"
+name = "sui-network"
 version = "0.1.0"
 authors = ["Mysten Labs <[email protected]>"]
 license = "Apache-2.0"
@@ -14,7 +14,7 @@ net2 = "0.2.37"
 tokio = { version = "1.15.0", features = ["full"] }
 tracing = { version = "0.1", features = ["log"] }
 
-fastx-types = { path = "../fastx_types" }
+sui-types = { path = "../sui_types" }
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["net2"]

network_utils/src/network.rs

@@ -3,9 +3,9 @@
 
 use crate::transport::*;
 use bytes::Bytes;
-use fastx_types::{error::*, serialize::*};
 use futures::future::FutureExt;
 use std::sync::atomic::{AtomicUsize, Ordering};
+use sui_types::{error::*, serialize::*};
 use tracing::*;
 
 use std::io;

sui/Cargo.toml

@@ -31,9 +31,9 @@ tracing-subscriber = { version = "0.3", features = ["time", "env-filter"] }
 
 bcs = "0.1.3"
 sui_core = { path = "../sui_core" }
-fastx-adapter = { path = "../fastx_programmability/adapter" }
-fastx-network = { path = "../network_utils" }
-fastx-types = { path = "../fastx_types" }
+sui-adapter = { path = "../sui_programmability/adapter" }
+sui-network = { path = "../network_utils" }
+sui-types = { path = "../sui_types" }
 
 rustyline = "9.1.2"
 rustyline-derive = "0.6.0"
@@ -53,5 +53,5 @@ name = "wallet"
 path = "src/wallet.rs"
 
 [[bin]]
-name = "fastx"
-path = "src/fastx.rs"
+name = "sui"
+path = "src/sui.rs"

sui/src/bench.rs

@@ -4,16 +4,16 @@
 #![deny(warnings)]
 
 use bytes::Bytes;
-use fastx_network::{network::NetworkClient, transport};
-use fastx_types::FASTX_FRAMEWORK_ADDRESS;
-use fastx_types::{base_types::*, committee::*, messages::*, object::Object, serialize::*};
 use futures::stream::StreamExt;
 use move_core_types::ident_str;
 use rand::rngs::StdRng;
 use rand::Rng;
 use std::time::{Duration, Instant};
 use structopt::StructOpt;
 use sui_core::{authority::*, authority_server::AuthorityServer};
+use sui_network::{network::NetworkClient, transport};
+use sui_types::SUI_FRAMEWORK_ADDRESS;
+use sui_types::{base_types::*, committee::*, messages::*, object::Object, serialize::*};
 use tokio::runtime::Runtime;
 use tokio::{runtime::Builder, time};
 use tracing::subscriber::set_global_default;
@@ -209,7 +209,7 @@ impl ClientServerBenchmark {
             let order = if self.use_move {
                 // TODO: authority should not require seq# or digets for package in Move calls. Use dummy values
                 let framework_obj_ref = (
-                    FASTX_FRAMEWORK_ADDRESS,
+                    SUI_FRAMEWORK_ADDRESS,
                     SequenceNumber::new(),
                     ObjectDigest::new([0; 32]),
                 );

sui/src/config.rs

@@ -1,15 +1,13 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 // SPDX-License-Identifier: Apache-2.0
 
-use fastx_types::{
+use sui_core::client::ClientState;
+use sui_types::{
     base_types::*,
     messages::{CertifiedOrder, OrderKind},
 };
-use sui_core::client::ClientState;
 
 use crate::utils::Config;
-use fastx_network::transport;
-use fastx_types::object::Object;
 use move_core_types::language_storage::TypeTag;
 use move_core_types::{identifier::Identifier, transaction_argument::TransactionArgument};
 use serde::{Deserialize, Serialize};
@@ -22,6 +20,8 @@ use std::{
     io::{BufReader, BufWriter, Write},
     iter::FromIterator,
 };
+use sui_network::transport;
+use sui_types::object::Object;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthorityConfig {

sui/src/fastx.rs → sui/src/sui.rs

@@ -1,8 +1,5 @@
 // Copyright (c) Mysten Labs
 // SPDX-License-Identifier: Apache-2.0
-use fastx_types::base_types::{get_key_pair, ObjectID, SequenceNumber};
-use fastx_types::committee::Committee;
-use fastx_types::object::Object;
 use futures::future::join_all;
 use std::collections::BTreeMap;
 use std::net::TcpListener;
@@ -14,6 +11,9 @@ use sui::config::{AccountInfo, AuthorityInfo, AuthorityPrivateInfo, NetworkConfi
 use sui::utils::Config;
 use sui_core::authority::{AuthorityState, AuthorityStore};
 use sui_core::authority_server::AuthorityServer;
+use sui_types::base_types::{get_key_pair, ObjectID, SequenceNumber};
+use sui_types::committee::Committee;
+use sui_types::object::Object;
 use tracing::error;
 use tracing::subscriber::set_global_default;
 use tracing_subscriber::EnvFilter;
@@ -36,7 +36,7 @@ struct FastXOpt {
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub enum FastXCommand {
-    /// Start fastx network.
+    /// Start sui network.
     #[structopt(name = "start")]
     Start,
     #[structopt(name = "genesis")]

sui/src/wallet.rs

@@ -75,7 +75,7 @@ async fn main() -> Result<(), anyhow::Error> {
         println!();
 
         let mut shell = Shell {
-            prompt: "fastx>-$ ",
+            prompt: "sui>-$ ",
             state: context,
             handler: ClientCommandHandler,
             description: String::new(),

sui/src/wallet_commands.rs

@@ -1,18 +1,17 @@
 // Copyright (c) Mysten Labs
 // SPDX-License-Identifier: Apache-2.0
 use crate::config::{AccountInfo, AuthorityInfo, WalletConfig};
-use fastx_network::network::NetworkClient;
-use fastx_types::base_types::{
+use sui_core::authority_client::AuthorityClient;
+use sui_core::client::{Client, ClientState};
+use sui_network::network::NetworkClient;
+use sui_types::base_types::{
     decode_address_hex, encode_address_hex, get_key_pair, AuthorityName, ObjectID, PublicKeyBytes,
     SuiAddress,
 };
-use fastx_types::committee::Committee;
-use fastx_types::messages::{ExecutionStatus, OrderEffects};
-use sui_core::authority_client::AuthorityClient;
-use sui_core::client::{Client, ClientState};
+use sui_types::committee::Committee;
+use sui_types::messages::{ExecutionStatus, OrderEffects};
 
 use crate::utils::Config;
-use fastx_types::error::SuiError;
 use move_core_types::identifier::Identifier;
 use move_core_types::language_storage::TypeTag;
 use move_core_types::parser::{parse_transaction_argument, parse_type_tag};
@@ -22,6 +21,7 @@ use std::path::PathBuf;
 use std::time::{Duration, Instant};
 use structopt::clap::AppSettings;
 use structopt::StructOpt;
+use sui_types::error::SuiError;
 use tracing::*;
 
 #[derive(StructOpt)]

sui_core/Cargo.toml

@@ -22,10 +22,10 @@ tracing = { version = "0.1", features = ["log"] }
 signature = "1.5.0"
 ed25519-dalek = "1.0.1"
 
-fastx-adapter = { path = "../fastx_programmability/adapter" }
-fastx-framework = { path = "../fastx_programmability/framework" }
-fastx-network = { path = "../network_utils" }
-fastx-types = { path = "../fastx_types" }
+sui-adapter = { path = "../sui_programmability/adapter" }
+sui-framework = { path = "../sui_programmability/framework" }
+sui-network = { path = "../network_utils" }
+sui-types = { path = "../sui_types" }
 
 move-binary-format = { git = "https://github.com/diem/move", rev="1e5e36cb1fede8073c8688886a0943bb5bfe40d5" }
 move-core-types = { git = "https://github.com/diem/move", rev="1e5e36cb1fede8073c8688886a0943bb5bfe40d5", features=["address20"] }

sui_core/src/authority.rs

@@ -1,16 +1,6 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 // SPDX-License-Identifier: Apache-2.0
 
-use fastx_adapter::{adapter, genesis};
-use fastx_types::{
-    base_types::*,
-    committee::Committee,
-    error::{SuiError, SuiResult},
-    fp_bail, fp_ensure, gas,
-    messages::*,
-    object::{Data, Object},
-    storage::Storage,
-};
 use move_core_types::{
     account_address::AccountAddress,
     language_storage::{ModuleId, StructTag},
@@ -22,6 +12,16 @@ use std::{
     pin::Pin,
     sync::Arc,
 };
+use sui_adapter::{adapter, genesis};
+use sui_types::{
+    base_types::*,
+    committee::Committee,
+    error::{SuiError, SuiResult},
+    fp_bail, fp_ensure, gas,
+    messages::*,
+    object::{Data, Object},
+    storage::Storage,
+};
 
 #[cfg(test)]
 #[path = "unit_tests/authority_tests.rs"]

sui_core/src/authority/temporary_store.rs

@@ -1,4 +1,4 @@
-use fastx_types::event::Event;
+use sui_types::event::Event;
 
 use super::*;
 

sui_core/src/authority_aggregator.rs

@@ -4,14 +4,14 @@
 use crate::authority_client::AuthorityAPI;
 use crate::safe_client::SafeClient;
 
-use fastx_types::object::{Object, ObjectRead};
-use fastx_types::{
+use futures::{future, StreamExt};
+use sui_types::object::{Object, ObjectRead};
+use sui_types::{
     base_types::*,
     committee::Committee,
     error::{SuiError, SuiResult},
     messages::*,
 };
-use futures::{future, StreamExt};
 
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::time::Duration;

sui_core/src/authority_client.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use async_trait::async_trait;
-use fastx_network::network::NetworkClient;
-use fastx_types::{error::SuiError, messages::*, serialize::*};
+use sui_network::network::NetworkClient;
+use sui_types::{error::SuiError, messages::*, serialize::*};
 
 #[async_trait]
 pub trait AuthorityAPI {

sui_core/src/authority_server.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::authority::AuthorityState;
-use fastx_network::{
+use sui_network::{
     network::NetworkServer,
     transport::{spawn_server, MessageHandler, SpawnedServer},
 };
-use fastx_types::{error::*, messages::*, serialize::*};
+use sui_types::{error::*, messages::*, serialize::*};
 
 use std::io;
 use tracing::*;

sui_core/src/client.rs

@@ -3,15 +3,15 @@
 
 use crate::{authority_aggregator::AuthorityAggregator, authority_client::AuthorityAPI};
 use async_trait::async_trait;
-use fastx_framework::build_move_package_to_bytes;
-use fastx_types::{
-    base_types::*, committee::Committee, error::SuiError, fp_ensure, messages::*,
-    object::ObjectRead,
-};
 use futures::future;
 use itertools::Itertools;
 use move_core_types::identifier::Identifier;
 use move_core_types::language_storage::TypeTag;
+use sui_framework::build_move_package_to_bytes;
+use sui_types::{
+    base_types::*, committee::Committee, error::SuiError, fp_ensure, messages::*,
+    object::ObjectRead,
+};
 use typed_store::rocks::open_cf;
 use typed_store::Map;
 
@@ -34,7 +34,7 @@ pub mod client_store;
 use self::client_store::ClientStore;
 
 #[cfg(test)]
-use fastx_types::FASTX_FRAMEWORK_ADDRESS;
+use sui_types::SUI_FRAMEWORK_ADDRESS;
 
 pub type AsyncResult<'a, T, E> = future::BoxFuture<'a, Result<T, E>>;
 
@@ -237,7 +237,7 @@ where
 
     #[cfg(test)]
     pub async fn get_framework_object_ref(&mut self) -> Result<ObjectRef, anyhow::Error> {
-        let info = self.get_object_info(FASTX_FRAMEWORK_ADDRESS).await?;
+        let info = self.get_object_info(SUI_FRAMEWORK_ADDRESS).await?;
         Ok(info.reference()?)
     }
 

sui_core/src/client/client_store.rs

@@ -1,8 +1,8 @@
 use super::*;
-use fastx_types::object::Object;
 use rocksdb::{DBWithThreadMode, MultiThreaded};
 use std::path::PathBuf;
 use std::sync::Arc;
+use sui_types::object::Object;
 use typed_store::rocks::DBMap;
 
 const CERT_CF_NAME: &str = "certificates";

sui_core/src/generate_format.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 // SPDX-License-Identifier: Apache-2.0
 
-use fastx_types::{error, messages, serialize};
+use sui_types::{error, messages, serialize};
 use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig};
 use std::{fs::File, io::Write};
 use structopt::{clap::arg_enum, StructOpt};

sui_core/src/safe_client.rs

@@ -3,9 +3,9 @@
 
 use crate::authority_client::AuthorityAPI;
 use async_trait::async_trait;
-use fastx_types::{base_types::*, committee::*, fp_ensure};
+use sui_types::{base_types::*, committee::*, fp_ensure};
 
-use fastx_types::{
+use sui_types::{
     error::{SuiError, SuiResult},
     messages::*,
 };