From e5619d48cd02a848adee2f743e0368a425719ee3 Mon Sep 17 00:00:00 2001
From: Kevin Lewi <klewi@fb.com>
Date: Thu, 8 Jul 2021 19:19:21 -0700
Subject: [PATCH] Switch CI to using stable instead of nightly toolchain

(cherry picked from commit 6062bdb5cd993a3bccf2fea26f1f379b1cc37257)
---
 .github/workflows/main.yml | 14 +++++++-------
 src/messages.rs            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c8b6896..ca5d581 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
           - u64_backend
           - u32_backend
         toolchain:
-          - nightly
+          - stable
           - 1.41.0
     name: test
     steps:
@@ -79,7 +79,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - nightly
+          - stable
           - 1.41.0
     name: test simple_login command-line example
     steps:
@@ -103,7 +103,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - nightly
+          - stable
           - 1.41.0
     name: test digital_locker command-line example
     steps:
@@ -148,11 +148,11 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install nightly toolchain
+      - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: stable
           override: true
           components: rustfmt, clippy
 
@@ -170,11 +170,11 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install nightly toolchain
+      - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: stable
           override: true
           components: rustfmt, clippy
 
diff --git a/src/messages.rs b/src/messages.rs
index d49bd29..a820818 100644
--- a/src/messages.rs
+++ b/src/messages.rs
@@ -104,8 +104,8 @@ impl<CS: CipherSuite> RegistrationResponse<CS> {
             KeyPair::<CS::Group>::check_public_key(Key::from_bytes(&checked_slice[elem_len..])?)?;
 
         Ok(Self {
-            server_s_pk: server_s_pk.to_arr().to_vec(),
             beta,
+            server_s_pk: server_s_pk.to_arr().to_vec(),
         })
     }
 }