Squashing:

GH-600: Add get_block_number GH-600: Address PR feedback GH-585: Experiment with adapting test for platform specific error codes GH-585: Provide Windows platform specific error code and message GH-600: Rebase master into branch
MASQ-Project · May 8, 2023 · 8a01f3a · 8a01f3a
1 parent 2c78856
commit 8a01f3a
Show file tree

Hide file tree

Showing 7 changed files with 776 additions and 330 deletions.
diff --git a/multinode_integration_tests/docker/macos/Dockerfile b/multinode_integration_tests/docker/macos/Dockerfile
@@ -1,13 +1,13 @@
-FROM rust:stretch
+FROM rust:bullseye
 
 ARG uid
 ARG gid
 
-RUN (addgroup substratum --gid $gid || continue) \
-    && adduser --disabled-password --uid $uid --gid $gid --home /home/substratum substratum \
-    && chown -R $uid:$gid /home/substratum
+RUN (addgroup masq --gid $gid || continue) \
+    && adduser --disabled-password --uid $uid --gid $gid --home /home/masq masq \
+    && chown -R $uid:$gid /home/masq
 
 RUN apt-get update && apt-get install -y sudo curl && rustup component add rustfmt clippy \
     && cargo install sccache && chown -R $uid:$gid /usr/local/cargo /usr/local/rustup
 
-USER substratum
+USER masq
diff --git a/node/src/blockchain/blockchain_bridge.rs b/node/src/blockchain/blockchain_bridge.rs