Skip to content

Commit

Permalink
standardize vm_genesis -> vm-genesis
Browse files Browse the repository at this point in the history
Closes: aptos-labs#1375
Approved by: metajack
  • Loading branch information
huitseeker authored and bors-libra committed Oct 17, 2019
1 parent 845a3ee commit ed4a20c
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Network Trash Folder
Temporary Items
.apdisk

# Generated VM config in vm_genesis
language/vm/vm_genesis/genesis/vm_config.toml
# Generated VM config in vm-genesis
language/vm/vm-genesis/genesis/vm_config.toml

# local cargo config
.cargo/config
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ members = [
"language/vm/vm_runtime",
"language/vm/vm_runtime/vm-cache-map",
"language/vm/vm_runtime/vm_runtime_types",
"language/vm/vm_genesis",
"language/vm/vm-genesis",
"libra-node",
"libra-swarm",
"network",
Expand Down
2 changes: 1 addition & 1 deletion config/config-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ generate-keypair = { path = "../generate-keypair" }
libra-logger = { path = "../../common/logger" }
prost-ext = { path = "../../common/prost-ext" }
libra-types = { path = "../../types" }
vm_genesis = { path = "../../language/vm/vm_genesis" }
vm-genesis = { path = "../../language/vm/vm-genesis" }

[dev-dependencies]
libra-types = { path = "../../types", features = ["testing"]}
2 changes: 1 addition & 1 deletion consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ rusty-fork = "0.2.2"
consensus-types = { path = "consensus-types", features = ["fuzzing", "testing"]}
crypto = { path = "../crypto/crypto", features = ["testing"]}
libra-types = { path = "../types", features = ["testing"]}
vm_genesis = { path = "../language/vm/vm_genesis" }
vm-genesis = { path = "../language/vm/vm-genesis" }
vm_validator = { path = "../vm_validator" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion execution/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ libra-types = { path = "../../types", features = ["testing"]}

storage-proto = { path = "../../storage/storage-proto" }
storage-service = { path = "../../storage/storage-service" }
vm_genesis = { path = "../../language/vm/vm_genesis" }
vm-genesis = { path = "../../language/vm/vm-genesis" }
transaction-builder = { path = "../../language/transaction-builder" }
2 changes: 1 addition & 1 deletion language/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ Libra Core components interact with the language component through the VM. Speci
├── cost-synthesis # Cost synthesis for bytecode instructions
├── src # Bytecode language definitions, serializer, and deserializer
├── tests # VM tests
├── vm_genesis # The genesis state creation, and blockchain genesis writeset
├── vm-genesis # The genesis state creation, and blockchain genesis writeset
└── vm_runtime # The bytecode interpreter
```
2 changes: 1 addition & 1 deletion language/e2e_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ state-view = { path = "../../storage/state-view" }
libra-types = { path = "../../types" }
transaction-builder = { path = "../transaction-builder", features = ["testing"]}
vm = { path = "../vm" }
vm_genesis = { path = "../vm/vm_genesis" }
vm-genesis = { path = "../vm/vm-genesis" }
vm_runtime = { path = "../vm/vm_runtime" }
vm_runtime_types = { path = "../vm/vm_runtime/vm_runtime_types" }
proptest = "0.9.3"
Expand Down
2 changes: 1 addition & 1 deletion language/e2e_tests/src/data_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ lazy_static! {
pub static ref GENESIS_WRITE_SET: WriteSet = {
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
path.pop();
path.push("vm/vm_genesis/genesis/genesis.blob");
path.push("vm/vm-genesis/genesis/genesis.blob");

load_genesis(path)
};
Expand Down
2 changes: 1 addition & 1 deletion language/vm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ simple abstraction over the file format. Additionally, a set of
├── cost-synthesis # Infrastructure for gas cost synthesis
├── src # VM core files
├── tests # Proptests
├── vm_genesis # Helpers to generate a genesis block, the initial state of the blockchain
├── vm-genesis # Helpers to generate a genesis block, the initial state of the blockchain
└── vm_runtime # Interpreter and runtime data types (see README in that folder)
```

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "vm_genesis"
name = "vm-genesis"
version = "0.1.0"
edition = "2018"
authors = ["Libra Association <[email protected]>"]
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ fn genesis_blob_unchanged() {
let mut old_genesis_bytes = vec![];
genesis_file.read_to_end(&mut old_genesis_bytes).unwrap();
assert!(old_genesis_bytes == generate_genesis_blob(),
format!("The freshly generated genesis file is different from the one on disk at {}. Did you forget to regenerate the genesis file via `cargo run` inside libra/language/vm/vm_genesis?", GENESIS_LOCATION));
format!("The freshly generated genesis file is different from the one on disk at {}. Did you forget to regenerate the genesis file via `cargo run` inside libra/language/vm/vm-genesis?", GENESIS_LOCATION));
}
2 changes: 1 addition & 1 deletion state-synchronizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ config-builder = { path = "../config/config-builder" }
crypto = { path = "../crypto/crypto", features = ["testing"]}
parity-multiaddr = "0.5.0"
libra-types = { path = "../types", features = ["testing"] }
vm_genesis = { path = "../language/vm/vm_genesis" }
vm-genesis = { path = "../language/vm/vm-genesis" }
transaction-builder = { path = "../language/transaction-builder" }
channel = { path = "../common/channel" }

0 comments on commit ed4a20c

Please sign in to comment.