From 4dc97e770467d04e6795027af988dfa60fd54bf2 Mon Sep 17 00:00:00 2001
From: deniallugo <deniallugo@gmail.com>
Date: Wed, 18 Aug 2021 15:36:21 +0300
Subject: [PATCH] Fix sqlx version

Signed-off-by: deniallugo <deniallugo@gmail.com>
---
 docker/ci-integration-test/Dockerfile    | 47 -----------------------
 docker/ci-integration-test/entrypoint.sh | 48 ------------------------
 docs/setup-dev.md                        |  2 +-
 infrastructure/zk/src/docker.ts          |  1 -
 4 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 docker/ci-integration-test/Dockerfile
 delete mode 100755 docker/ci-integration-test/entrypoint.sh

diff --git a/docker/ci-integration-test/Dockerfile b/docker/ci-integration-test/Dockerfile
deleted file mode 100644
index ed460e1c84..0000000000
--- a/docker/ci-integration-test/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM matterlabs/geth:latest as geth
-FROM debian:buster-slim
-
-WORKDIR /usr/src/zksync
-
-# Install required dependencies
-RUN apt-get update; apt-get install -y make bash git postgresql openssl libssl-dev gcc g++ curl libpq-dev pkg-config software-properties-common jq
-
-# Install node and yarn
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
-RUN npm install -g yarn
-
-# Install Rust and required cargo packages
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-RUN cargo install diesel_cli --no-default-features --features postgres
-RUN cargo install --version=0.2.0 sqlx-cli
-
-# Postgresql: Enable trust authentication to allow any connections.
-RUN mkdir -p /etc/postgresql/11/main
-RUN echo "host all  all    0.0.0.0/0  trust" > /etc/postgresql/11/main/pg_hba.conf
-
-# Copy geth files
-RUN apt-get install -y ca-certificates
-RUN mkdir -p /seed/keystore
-RUN mkdir -p /var/lib/geth/data
-COPY --from=geth /seed/* /seed/
-COPY --from=geth /seed/keystore/* /seed/keystore/
-COPY --from=geth /bin/geth-entry.sh /usr/local/bin/
-RUN curl https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.22-c71a7e26.tar.gz -o geth-linux-amd64-1.9.22-c71a7e26.tar.gz
-RUN tar -xzf geth-linux-amd64-1.9.22-c71a7e26.tar.gz && cp ./geth-linux-amd64-1.9.22-c71a7e26/geth /usr/local/bin
-
-# Install `solc`
-RUN curl -LO https://github.com/ethereum/solidity/releases/download/v0.5.16/solc-static-linux
-RUN chmod +x solc-static-linux
-RUN mv solc-static-linux /usr/local/bin/solc
-
-# Copy the setup script
-COPY docker/ci-integration-test/entrypoint.sh /usr/local/bin/
-
-# Setup the environment
-ENV ZKSYNC_HOME=/usr/src/zksync
-ENV PATH="${ZKSYNC_HOME}/bin:${PATH}"
-ENV CI=1
diff --git a/docker/ci-integration-test/entrypoint.sh b/docker/ci-integration-test/entrypoint.sh
deleted file mode 100755
index d37ba085f6..0000000000
--- a/docker/ci-integration-test/entrypoint.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -ue
-
-# Run geth
-nohup /usr/local/bin/geth-entry.sh &>/dev/null &
-
-# Initialize database
-service postgresql restart
-
-# Prepare dummy-prover in the contract (so the redeployed version will be OK)
-zk dummy-prover enable --no-redeploy
-
-# Initialize the stack
-zk run verify-keys unpack
-zk run yarn || true # It can fail
-zk db setup
-zk contract build
-zk run deploy-erc20 dev
-zk run governance-add-erc20 dev
-zk server --genesis
-zk contract redeploy
-
-# Compile required dependencies
-zk f cargo build --bin zksync_server --release
-zk f cargo build --bin dummy_prover --release
-zk f cargo build --bin dev-ticker-server --release
-zk f cargo build --bin dev-liquidity-token-watcher --release
-
-# Launch binaries
-echo "Launching dev-ticker-server..."
-nohup zk f $ZKSYNC_HOME/target/release/dev-ticker-server &>/dev/null &
-sleep 1
-
-# Launch binaries
-echo "Launching dev-liquidity-token-watcher..."
-nohup zk f $ZKSYNC_HOME/target/release/dev-liquidity-token-watcher &>/dev/null &
-sleep 1
-
-echo "Launching server..."
-nohup zk f $ZKSYNC_HOME/target/release/zksync_server &>$ZKSYNC_HOME/server.log &
-sleep 1
-
-echo "Launching dummy-prover..."
-nohup zk f $ZKSYNC_HOME/target/release/dummy_prover "dummy-prover-instance" &>$ZKSYNC_HOME/dummy_prover.log &
-
-# Wait for server to start
-sleep 10
-
-echo "Done!"
diff --git a/docs/setup-dev.md b/docs/setup-dev.md
index b753688198..3c7b7fae3b 100644
--- a/docs/setup-dev.md
+++ b/docs/setup-dev.md
@@ -133,7 +133,7 @@ sudo apt install build-essential
 Also, we need `[sqlx](https://github.com/launchbadge/sqlx)` CLI (it is used to generate database wrappers):
 
 ```bash
-cargo install --version=0.2.0 sqlx-cli
+cargo install --version=0.5.5 sqlx-cli
 ```
 
 If you face an error `Could not find directory of OpenSSL installation`, then you should do the following.
diff --git a/infrastructure/zk/src/docker.ts b/infrastructure/zk/src/docker.ts
index 35549d8704..38b3fa69cb 100644
--- a/infrastructure/zk/src/docker.ts
+++ b/infrastructure/zk/src/docker.ts
@@ -12,7 +12,6 @@ const IMAGES = [
     'ci',
     'exit-tool',
     'dev-liquidity-token-watcher',
-    'ci-integration-test',
     'zk-environment',
     'event-listener',
     'data-restore'