Merge pull request #2 from base/require-1.85

chore: require 1.85

.github/workflows/ci.yaml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "master" ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -67,4 +67,4 @@ jobs:
           context: .
           push: false
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

Cargo.toml

@@ -2,6 +2,7 @@
 name = "flashblocks-websocket-proxy"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.85"
 
 [dependencies]
 tokio = { version = "1.28", features = ["full"] }

Dockerfile

@@ -15,4 +15,4 @@ WORKDIR /app
 ARG BINARY="flashblocks-websocket-proxy"
 COPY --from=builder /app/target/release/${BINARY} /usr/local/bin/
 
-ENTRYPOINT ["/usr/local/bin/flashblocks-websocket-proxy"]
+ENTRYPOINT ["/usr/local/bin/flashblocks-websocket-proxy"]

src/integration.rs

@@ -288,7 +288,6 @@ mod test {
         harness.send_messages(vec!["six"]);
         harness.wait_for_messages_to_drain().await;
 
-
         assert_eq!(
             vec!["one", "two", "three", "four", "five", "six"],
             harness.messages_for_client(client_one)
@@ -301,6 +300,9 @@ mod test {
             vec!["one", "two"],
             harness.messages_for_client(client_three)
         );
-        assert_eq!(vec!["five", "six"], harness.messages_for_client(client_four));
+        assert_eq!(
+            vec!["five", "six"],
+            harness.messages_for_client(client_four)
+        );
     }
 }