[rename] cleanups in config

config/README.md

@@ -58,29 +58,29 @@ The configuration for validator `I`, can be produced by:
     config-builder validator \
         -a $PUBLIC_MULTIADDR_FOR_VALIDATOR_I \
         -b $PUBLIC_MULTIADDR_FOR_VALIDATOR_0 \
-        -d /opt/diem/data \
+        -d /opt/aptos/data \
         -i $I \
         -l $ANY_MULTIADDR_FOR_VALIDATOR_I \
         -n $TOTAL_NUMBER_OF_VALIDATORS \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s $SHARED_SECRET
 
 As an example, this is the 2nd Validator (offset 1) in a 4 Validator TestNet:
 
     config-builder validator \
         -a "/ip4/1.1.1.2/tcp/7000" \
         -b "/ip4/1.1.1.1/tcp/7000" \
-        -d /opt/diem/data \
+        -d /opt/aptos/data \
         -i 1 \
         -l "/ip4/0.0.0.0/tcp/7000" \
         -n 4 \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s 0123456789abcdef101112131415161718191a1b1c1d1e1f2021222324252627
 
 To create a mint service's key:
 
     config-builder faucet \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s 0123456789abcdef101112131415161718191a1b1c1d1e1f2021222324252627
 
 Instantiating a FullNode config is similar to instantiating a Validator config.
@@ -97,10 +97,10 @@ networks.
     config-builder full-node (create | extend) \
         -a $PUBLIC_MULTIADDR_FOR_FULL_NODE_I \
         -b $PUBLIC_MULTIADDR_FOR_FULL_NODE_0 \
-        -d /opt/diem/data \
+        -d /opt/aptos/data \
         -l $ANY_MULTIADDR_FOR_FULL_NODE_I \
         -n $TOTAL_NUMBER_OF_VALIDATORS \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s $VALIDATOR_SHARED_SECRET \
         [ -i $I -f $TOTAL_NUMBER_OF_FULL_NODES -c $FULL_NODE_SHARED_SECRET | -p ]
 
@@ -110,10 +110,10 @@ configuration.
     config-builder full-node extend \
         -a "/ip4/1.1.1.2/tcp/7100" \
         -b "/ip4/1.1.1.2/tcp/7100" \
-        -d /opt/diem/data \
+        -d /opt/aptos/data \
         -l "/ip4/0.0.0.0/tcp/7100" \
         -n 4 \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s 0123456789abcdef101112131415161718191a1b1c1d1e1f2021222324252627 \
         -i 0 \
         -f 4 \
@@ -125,10 +125,10 @@ Validator/FullNode hybrid configured above.
     config-builder full-node create \
         -a "/ip4/1.1.1.3/tcp/7100" \
         -b "/ip4/1.1.1.2/tcp/7100" \
-        -d /opt/diem/fn/data \
+        -d /opt/aptos/fn/data \
         -l "/ip4/0.0.0.0/tcp/7100" \
         -n 4 \
-        -o /opt/diem/fn/etc \
+        -o /opt/aptos/fn/etc \
         -s 0123456789abcdef101112131415161718191a1b1c1d1e1f2021222324252627 \
         -i 1 \
         -f 4 \
@@ -139,10 +139,10 @@ Similarly a public network could be added via:
     config-builder full-node create \
         -a "/ip4/1.1.1.2/tcp/7100" \
         -b "/ip4/1.1.1.2/tcp/7100" \
-        -d /opt/diem/fn/data \
+        -d /opt/aptos/fn/data \
         -l "/ip4/0.0.0.0/tcp/7100" \
         -n 4 \
-        -o /opt/diem/etc \
+        -o /opt/aptos/etc \
         -s 0123456789abcdef101112131415161718191a1b1c1d1e1f2021222324252627 \
         -p
 

config/management/src/config.rs

@@ -52,7 +52,7 @@ use structopt::StructOpt;
 /// //     cmd [OPTIONS] --test <test>
 ///```
 
-/// Config for diem management tools
+/// Config for aptos management tools
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Config {
     #[serde(deserialize_with = "chain_id::deserialize_config_chain_id")]

config/management/src/secure_backend.rs

@@ -221,19 +221,19 @@ mod tests {
         let path_str = path.path().to_str().unwrap();
 
         let github = format!(
-            "backend=github;repository_owner=diem;repository=diem;token={}",
+            "backend=github;repository_owner=aptos;repository=aptos;token={}",
             path_str
         );
         storage(&github).unwrap();
 
         let github = format!(
-            "backend=github;repository_owner=diem;repository=diem;token={};namespace=test",
+            "backend=github;repository_owner=aptos;repository=aptos;token={};namespace=test",
             path_str
         );
         storage(&github).unwrap();
 
         let github = format!(
-            "backend=github;repository_owner=diem;repository=diem;branch=genesis;token={};namespace=test",
+            "backend=github;repository_owner=aptos;repository=aptos;branch=genesis;token={};namespace=test",
             path_str
         );
         storage(&github).unwrap();

config/src/config/mod.rs

@@ -100,7 +100,7 @@ pub struct BaseConfig {
 impl Default for BaseConfig {
     fn default() -> BaseConfig {
         BaseConfig {
-            data_dir: PathBuf::from("/opt/diem/data"),
+            data_dir: PathBuf::from("/opt/aptos/data"),
             role: RoleType::Validator,
             waypoint: WaypointConfig::None,
         }

config/src/config/secure_backend_config.rs

@@ -140,7 +140,7 @@ impl Default for OnDiskStorageConfig {
         Self {
             namespace: None,
             path: PathBuf::from("secure_storage.json"),
-            data_dir: PathBuf::from("/opt/diem/data"),
+            data_dir: PathBuf::from("/opt/aptos/data"),
         }
     }
 }

config/src/config/storage_config.rs

@@ -71,7 +71,7 @@ impl Default for StorageConfig {
             // conservatively safe minimal prune window. It'll take a few Gigabytes of disk space
             // depending on the size of an average account blob.
             prune_window: Some(1_000_000),
-            data_dir: PathBuf::from("/opt/diem/data"),
+            data_dir: PathBuf::from("/opt/aptos/data"),
             // Default read/write/connection timeout, in milliseconds
             timeout_ms: 30_000,
             rocksdb_config: RocksdbConfig::default(),

config/src/config/test_data/public_full_node.yaml

@@ -1,6 +1,6 @@
 base:
     # Update this value to the location you want Diem to store its database
-    data_dir: "/opt/diem/data"
+    data_dir: "/opt/aptos/data"
     role: "full_node"
     waypoint:
         # Update this value to that which Diem publicly provides. Please regard the directions

config/src/config/test_data/validator.yaml

@@ -1,5 +1,5 @@
 base:
-    data_dir: "/opt/diem/data"
+    data_dir: "/opt/aptos/data"
     role: "validator"
     waypoint:
         from_storage:

config/src/config/test_data/validator_full_node.yaml

@@ -1,5 +1,5 @@
 base:
-    data_dir: "/opt/diem/data"
+    data_dir: "/opt/aptos/data"
     role: "full_node"
     waypoint:
         from_storage: