Merge pull request #49 from input-output-hk/update-vit-deps

update deps

.circleci/config.yml

@@ -93,20 +93,22 @@ commands:
           name: install jormungandr
           command: |
             cd jormungandr
-            cargo install --path jormungandr
+            cargo install --path jormungandr --locked
       - run:
           name: checkout vit-station-service
           command: |
             git clone https://github.com/input-output-hk/vit-servicing-station.git
+            cd vit-servicing-station
+            git checkout 700c4d06b366c920e6daf46885d98d74d3791d0a
       - run:
           name: install vit-station-service
           command: |
             cd vit-servicing-station
-            cargo install --path vit-servicing-station-server
+            cargo install --path vit-servicing-station-server --locked
       - run:
           name: install iapyx utils
           command: |
-            cargo install --path iapyx
+            cargo install --path iapyx --locked
       - run:
           name: Run tests
           environment:

integration-tests/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2018"
 jormungandr-scenario-tests = { git = "https://github.com/input-output-hk/jormungandr.git",  rev = "7a201c6694118561f08e9140b9899888e6c6d993" } 
 jormungandr-testing-utils = { git = "https://github.com/input-output-hk/jormungandr.git",  rev = "7a201c6694118561f08e9140b9899888e6c6d993" }
 jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git",  rev = "7a201c6694118561f08e9140b9899888e6c6d993" }
-vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
-vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
+vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", rev = "700c4d06b366c920e6daf46885d98d74d3791d0a" }
+vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", rev = "700c4d06b366c920e6daf46885d98d74d3791d0a" }
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
 vitup = { path = "../vitup"} 
 iapyx = { path = "../iapyx"} 

integration-tests/src/non_functional/load_test.rs

@@ -27,7 +27,7 @@ pub fn load_test_public_100_000_votes() {
     let no_of_wallets = 3_000;
 
     let mut template_generator = ArbitraryValidVotingTemplateGenerator::new();
-    let (mut vit_controller, mut controller, vit_parameters, _fund_name) =
+    let (mut vit_controller, mut controller, vit_parameters, fund_name) =
         vitup_setup(false, no_of_wallets, testing_directory.path().to_path_buf());
 
     let (nodes, vit_station, wallet_proxy) = setup_network(
@@ -62,16 +62,16 @@ pub fn load_test_public_100_000_votes() {
             .status
     );
 
-    /* time::wait_for_epoch(10, nodes.get(0).unwrap().explorer());
+    time::wait_for_epoch(10, nodes.get(0).unwrap().explorer());
 
-        let mut committee = controller.wallet("committee").unwrap();
-        let vote_plan = controller.vote_plan(&fund_name).unwrap();
+    let mut committee = controller.wallet("committee").unwrap();
+    let vote_plan = controller.vote_plan(&fund_name).unwrap();
+
+    controller
+        .fragment_sender()
+        .send_public_vote_tally(&mut committee, &vote_plan.into(), nodes.get(0).unwrap())
+        .unwrap();
 
-        controller
-            .fragment_sender()
-            .send_public_vote_tally(&mut committee, &vote_plan.into(), nodes.get(0).unwrap())
-            .unwrap();
-    */
     vit_station.shutdown();
     wallet_proxy.shutdown();
     for node in nodes {
@@ -87,9 +87,9 @@ pub fn load_test_public_100_000_votes() {
 pub fn load_test_private_30_000_votes() {
     let endpoint = "127.0.0.1:8080";
     let testing_directory = TempDir::new().unwrap().into_persistent();
-    let no_of_votes = 100_000;
+    let no_of_votes = 30_000;
     let no_of_threads = 5;
-    let no_of_wallets = 3_000;
+    let no_of_wallets = 1_000;
 
     let mut template_generator = ArbitraryValidVotingTemplateGenerator::new();
     let (mut vit_controller, mut controller, vit_parameters, fund_name) =

vitup/Cargo.toml

@@ -23,8 +23,8 @@ jormungandr-testing-utils = { git = "https://github.com/input-output-hk/jormunga
 jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git",  rev = "7a201c6694118561f08e9140b9899888e6c6d993" }
 jormungandr-scenario-tests = { git = "https://github.com/input-output-hk/jormungandr.git", rev = "7a201c6694118561f08e9140b9899888e6c6d993" } 
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
-vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
-vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
+vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", rev = "700c4d06b366c920e6daf46885d98d74d3791d0a" }
+vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", rev = "700c4d06b366c920e6daf46885d98d74d3791d0a" }
 iapyx = { path = "../iapyx" }
 poldercast = { git = "https://github.com/primetype/poldercast.git", rev = "8305f1560392a9d26673ca996e7646c8834533ef" }
 rand = "0.7"