use ci-unified image

.gitlab-ci.yml

@@ -10,7 +10,7 @@ variables:
   GIT_DEPTH:                       100
   CARGO_INCREMENTAL:               0
   ARCH:                            "x86_64"
-  CI_IMAGE:                        "paritytech/bridges-ci:production"
+  CI_IMAGE:                        "paritytech/ci-unified:latest"
   RUST_BACKTRACE:                  full
   BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.29"
   BUILDAH_COMMAND:                 "buildah --storage-driver overlay2"

Dockerfile

@@ -8,7 +8,7 @@
 #
 # See the `deployments/README.md` for all the available `PROJECT` values.
 
-FROM docker.io/paritytech/bridges-ci:production as builder
+FROM docker.io/paritytech/ci-unified:latest as builder
 USER root
 WORKDIR /parity-bridges-common
 

README.md

@@ -38,18 +38,18 @@ cargo test --all
 ```
 
 Also you can build the repo with [Parity CI Docker
-image](https://github.com/paritytech/scripts/tree/master/dockerfiles/bridges-ci):
+image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-unified):
 
 ```bash
-docker pull paritytech/bridges-ci:production
+docker pull paritytech/ci-unified:latest
 mkdir ~/cache
 chown 1000:1000 ~/cache #processes in the container runs as "nonroot" user with UID 1000
 docker run --rm -it -w /shellhere/parity-bridges-common \
                     -v /home/$(whoami)/cache/:/cache/    \
                     -v "$(pwd)":/shellhere/parity-bridges-common \
                     -e CARGO_HOME=/cache/cargo/ \
                     -e SCCACHE_DIR=/cache/sccache/ \
-                    -e CARGO_TARGET_DIR=/cache/target/  paritytech/bridges-ci:production cargo build --all
+                    -e CARGO_TARGET_DIR=/cache/target/  paritytech/ci-unified:latest cargo build --all
 #artifacts can be found in ~/cache/target
 ```
 

relays/messages/src/message_race_loop.rs

@@ -313,7 +313,7 @@ where
 	}
 
 	fn nonces_to_submit(&self) -> Option<RangeInclusive<MessageNonce>> {
-		self.nonces_to_submit.as_ref().map(|(_, nonces, _)| nonces.clone())
+		self.nonces_to_submit.clone().map(|(_, nonces, _)| nonces)
 	}
 
 	fn reset_nonces_to_submit(&mut self) {