Import testsuite

Author: Yucong Sun

build.sh

@@ -10,7 +10,6 @@ cd ..
 # Then build rust client
 cd rust
 cargo build
-cargo test
 cd ..
 
 # C Stuff
@@ -21,5 +20,6 @@ cmake ..
 make VERBOSE=1
 
 # Test!
+cd rust && ./test.sh && cd ..
 ./c/c-client
 ./cpp/cpp-client

rust/Cargo.lock

@@ -44,15 +44,19 @@ crash-handler = { git  = "https://github.com/libra/libra.git", branch = "testnet
 failure = { package = "libra-failure-ext", git  = "https://github.com/libra/libra.git", branch = "testnet" }
 libra-logger =  { git  = "https://github.com/libra/libra.git", branch = "testnet" }
 libra-metrics = { git  = "https://github.com/libra/libra.git", branch = "testnet" }
-libra-tools = { git  = "https://github.com/libra/libra.git", branch = "testnet" }
+libra-tools = { git = "https://github.com/libra/libra.git", branch = "testnet" }
 
 [build-dependencies]
 bindgen = "0.51.1"
 
 [dev-dependencies]
 proptest = "0.9.2"
+libra-swarm = { git = "https://github.com/libra/libra.git", branch = "testnet" }
+libra-node = { git = "https://github.com/libra/libra.git", branch = "testnet" }
+generate-keypair = { git = "https://github.com/libra/libra.git", branch = "testnet" }
+compiler = { git = "https://github.com/libra/libra.git", branch = "testnet" }
 
 [features]
 # FIXEME
-default = ["libra-crypto/cloneable-private-keys"]
+default = []
 fuzzing = ["proptest", "libra-crypto/fuzzing", "fixme-libra-types/fuzzing"]

rust/Cargo.toml

@@ -0,0 +1,24 @@
+# Defaults are now set in config.rs
+
+[[networks]]
+seed_peers_file = ""  # For direct validation of this file
+network_keypairs_file = ""  # For direct validation of this file
+network_peers_file = ""  # For direct validation of this file
+role = "full_node"
+
+[consensus]
+consensus_keypair_file = "" # For direct validation of this file
+consensus_peers_file = ""  # For direct validation of this file
+
+[state_sync]
+upstream_peers = ["ae1b54220905fca36d046a6e093632ed1f219e0a35a4fd7ba82e6e0d515f0b8e"]
+
+[vm_config]
+  [vm_config.publishing_options]
+  type = "Locked"
+  whitelist = [
+    "ae1b54220905fca36d046a6e093632ed1f219e0a35a4fd7ba82e6e0d515f0b8e",
+    "fb999f2d6f45efc9b991993e332f40760171de8a46db40ca93f1baff56842c44",
+    "6465374a3ecf6d1a3836bbab3bcd624244a0217530a601fa20de80d562f87d80",
+    "774b10985dd9bf17ddee899256942c1dc0ab2c1b07d99ec78f774651f01e04b8"
+  ]

rust/config/data/configs/full_node.config.toml

@@ -0,0 +1,20 @@
+# Defaults are now set in config.rs
+[[networks]]
+seed_peers_file = ""  # For direct validation of this file
+network_keypairs_file = ""  # For direct validation of this file
+network_peers_file = ""  # For direct validation of this file
+role = "validator"
+
+[consensus]
+consensus_keypair_file = "" # For direct validation of this file
+consensus_peers_file = ""  # For direct validation of this file
+
+[vm_config]
+  [vm_config.publishing_options]
+  type = "Locked"
+  whitelist = [
+    "6aabc87f543f85e10216432d02b0251297d4c7723e906de481dfa04b057c2371",
+    "1cf66b5f5c911e80dad222b8ee8dfe3ad4830f75bb412ba12ea8e429203d9c83",
+    "a2180395d1632a0793f34e8a8a6be20b3b03bdceee35affe8c751fc8467b73a4",
+    "5ee07d4ac1ecf88f1b41c2c458f15699fe9d811c61563338253b3807b75c04c1",
+  ]

rust/config/data/configs/node.config.toml

@@ -0,0 +1,2 @@
+[base]
+data_dir_path = '/tmp/libra/test_persistent'

rust/config/data/configs/overrides/persistent_data.node.config.override.toml

@@ -0,0 +1,29 @@
+global:
+  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  # scrape_timeout is set to the global default (10s).
+
+# Alertmanager configuration
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+      # - alertmanager:9093
+
+# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
+rule_files:
+  # - "first_rules.yml"
+  # - "second_rules.yml"
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+  - job_name: 'libra-node'
+    honor_labels: true
+
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+
+    static_configs:
+    - targets: ['127.0.0.1:9091']

rust/config/data/metrics/prometheus.yml

@@ -468,7 +468,7 @@ impl ClientProxy {
         let dependencies_file = self.handle_dependencies(tmp_source_path.display(), is_module)?;
 
         let mut args = format!(
-            "run -p compiler -- {} -a {}{}",
+            "{} -a {}{}",
             tmp_source_path.display(),
             address,
             if is_module { " -m" } else { "" },
@@ -477,7 +477,7 @@ impl ClientProxy {
             args.push_str(&format!(" --deps={}", file.as_ref().display()));
         }
 
-        let status = Command::new("cargo")
+        let status = Command::new("./target/debug/compiler")
             .args(args.split(' '))
             .spawn()?
             .wait()?;
@@ -497,11 +497,11 @@ impl ClientProxy {
         source_path: Display,
         is_module: bool,
     ) -> Result<Option<TempPath>> {
-        let mut args = format!("run -p compiler -- -l {}", source_path);
+        let mut args = format!("-l {}", source_path);
         if is_module {
             args.push_str(" -m");
         }
-        let child = Command::new("cargo")
+        let child = Command::new("./target/debug/compiler")
             .args(args.split(' '))
             .stdout(Stdio::piped())
             .spawn()?;

rust/src/client_proxy.rs

@@ -0,0 +1,3 @@
+cargo build -p libra-node
+cargo build -p compiler
+cargo test --features=fuzzing

rust/test.sh

@@ -0,0 +1,12 @@
+// Copyright (c) The Libra Core Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+module MyModule {
+  import 0x0.LibraCoin;
+
+  // The identity function for coins: takes a LibraCoin.T as input and hands it back
+  public id(c: LibraCoin.T): LibraCoin.T {
+    return move(c);
+  }
+
+}

rust/tests/libratest/dev_modules/module.mvir

@@ -0,0 +1,13 @@
+// Copyright (c) The Libra Core Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import 0x0.LibraAccount;
+import 0x0.LibraCoin;
+import {{sender}}.MyModule;
+
+main(recipient: address, amount: u64) {
+  let coin: LibraCoin.T;
+  coin = LibraAccount.withdraw_from_sender(move(amount));
+  LibraAccount.deposit(move(recipient), MyModule.id(move(coin)));
+  return;
+}

rust/tests/libratest/dev_modules/script.mvir

@@ -0,0 +1,4 @@
+// Copyright (c) The Libra Core Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod smoke_test;