Merge branch 'dev' into alekseysidorov-931-ci-acceptable-loadtests

cyberarbitarge · Oct 20, 2020 · 3172af9 · 3172af9
2 parents 414593d + 5de003d
commit 3172af9
Show file tree

Hide file tree

Showing 35 changed files with 2,693 additions and 2,374 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,8 +46,8 @@ jobs:
     - name: zcli-tests
       run: ci-zcli.sh
 
-    - name: integration-simple-full-exit
-      run: ci-integration-simple-fullexit.sh
+    - name: integration-tests
+      run: ci-integration-tests.sh
 
     - name: data-restore
       run: zksync data-restore check-existing

diff --git a/Makefile b/Makefile
@@ -169,11 +169,8 @@ ci-check:
 integration-testkit:
 	@bin/integration-testkit.sh $(filter-out $@,$(MAKECMDGOALS))
 
-integration-simple:
-	@cd core/tests/ts-tests && yarn && yarn simple $(filter-out $@,$(MAKECMDGOALS))
-
-integration-full-exit:
-	@cd core/tests/ts-tests && yarn && yarn full-exit
+integration-test:
+	@cd core/tests/ts-tests && yarn && yarn test
 
 price:
 	@node contracts/scripts/check-price.js
@@ -292,5 +289,5 @@ image-dev-ticker:
 push-image-dev-ticker: image-dev-ticker
 	@docker push "${DEV_TICKER_DOCKER_IMAGE}"
 
-api-type-validate:
-	@cd core/tests/ts-tests && yarn && yarn api-type-validate --test
+api-test:
+	@cd core/tests/ts-tests && yarn && yarn api-test
diff --git a/bin/ci-integration-simple-fullexit.sh → bin/ci-integration-tests.sh b/bin/ci-integration-simple-fullexit.sh → bin/ci-integration-tests.sh
@@ -21,7 +21,7 @@ function cat_logs() {
     exitcode=$?
     echo "Termination started"
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $SERVER_PID
@@ -34,7 +34,7 @@ function cat_logs() {
     cat integration-prover.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }
@@ -53,11 +53,5 @@ zksync dummy-prover &> integration-prover.log &
 PROVER_PID=$!
 
 sleep 15
-echo "Performing integration-simple test..."
-zksync integration-simple
-echo "Performing integration-simple test http provider..."
-zksync integration-simple http
-echo "Performing integration-full-exit test..."
-zksync integration-full-exit
-echo "Performing api-type-validate test..."
-zksync api-type-validate
+zksync integration-test
+zksync api-test
diff --git a/bin/ci-zcli.sh b/bin/ci-zcli.sh
@@ -16,15 +16,15 @@ function cat_logs() {
     echo Termination started
 
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $TIMEOUT_PID,$SERVER_PID
     echo Server logs:
     cat zcli-test-server.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }

diff --git a/bin/rust-sdk-tests.sh b/bin/rust-sdk-tests.sh
@@ -21,7 +21,7 @@ function cat_logs() {
     echo Termination started
 
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $SERVER_PID
@@ -34,15 +34,22 @@ function cat_logs() {
     cat rust-sdk-prover.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }
 
 zksync dummy-prover status | grep -q 'disabled' && zksync dummy-prover enable
 
+# We have to compile binaries, because otherwise the time to compile it may exceed 15 seconds,
+# and the test will start without an actually running server.
+f cargo build --bin zksync_server --release
+f cargo build --bin dummy_prover --release
+
 zksync server &> rust-sdk-server.log &
 SERVER_PID=$!
+# Wait a bit, so server and prover won't have conflicts about the workspace lockfile.
+sleep 1 
 zksync dummy-prover &> rust-sdk-prover.log &
 PROVER_PID=$!
 

diff --git a/core/lib/storage/src/diff.rs b/core/lib/storage/src/diff.rs
@@ -97,32 +97,32 @@ impl Into<(u32, AccountUpdate)> for StorageAccountDiff {
 }
 
 impl StorageAccountDiff {
+    /// Compares updates by `block number` then by `update_order_id` (which is number within block).
+    pub fn cmp_order(&self, other: &Self) -> Ordering {
+        self.block_number()
+            .cmp(&other.block_number())
+            .then(self.update_order_id().cmp(&other.update_order_id()))
+    }
+
     /// Returns the index of the operation within block.
     pub fn update_order_id(&self) -> i32 {
-        *match self {
+        match self {
             StorageAccountDiff::BalanceUpdate(StorageAccountUpdate {
                 update_order_id, ..
-            }) => update_order_id,
+            }) => *update_order_id,
             StorageAccountDiff::Create(StorageAccountCreation {
                 update_order_id, ..
-            }) => update_order_id,
+            }) => *update_order_id,
             StorageAccountDiff::Delete(StorageAccountCreation {
                 update_order_id, ..
-            }) => update_order_id,
+            }) => *update_order_id,
             StorageAccountDiff::ChangePubKey(StorageAccountPubkeyUpdate {
                 update_order_id,
                 ..
-            }) => update_order_id,
+            }) => *update_order_id,
         }
     }
 
-    /// Compares updates by `block number` then by `update_order_id` (which is number within block).
-    pub fn cmp_order(&self, other: &Self) -> Ordering {
-        self.block_number()
-            .cmp(&other.block_number())
-            .then(self.update_order_id().cmp(&other.update_order_id()))
-    }
-
     /// Returns the block index to which the operation belongs.
     pub fn block_number(&self) -> i64 {
         *match self {