blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-05-01 00:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make mock rng a fixture to allow dyn Rng

Browse source
This commit is contained in:
oxalica 2024-09-09 04:21:16 -04:00
parent e40ec6a324
commit 61850aa1ed
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
blahd/tests/basic.rs
View file

@ -1,5 +1,7 @@
// FIXME: False positive?
#![allow(clippy::unwrap_used)]
// Easy to use for fixtures.
#![allow(clippy::toplevel_ref_arg)]
use std::fmt;
use std::future::IntoFuture;
use std::sync::{Arc, LazyLock};
@ -27,8 +29,9 @@ static ALICE: LazyLock<UserKey> = LazyLock::new(|| UserKey(ALICE_PRIV.verifying_
static BOB_PRIV: LazyLock<SigningKey> = LazyLock::new(|| SigningKey::from_bytes(&[b'B'; 32]));
// static BOB: LazyLock<UserKey> = LazyLock::new(|| UserKey(BOB_PRIV.verifying_key().to_bytes()));
fn mock_rng() -> impl RngCore {
rand::rngs::mock::StepRng::new(9, 1)
#[fixture]
fn rng() -> impl RngCore {
rand::rngs::mock::StepRng::new(42, 1)
}
#[derive(Debug, Deserialize)]
@ -180,8 +183,7 @@ async fn create_room(
#[case::public(true)]
#[case::private(false)]
#[tokio::test]
async fn room_create_get(server: Server, #[case] public: bool) {
let rng = &mut mock_rng();
async fn room_create_get(server: Server, ref mut rng: impl RngCore, #[case] public: bool) {
let mut room_meta = RoomMetadata {
rid: Id(0),
title: "test room".into(),
@ -264,8 +266,7 @@ async fn room_create_get(server: Server, #[case] public: bool) {
#[rstest]
#[tokio::test]
async fn room_join_leave(server: Server) {
let rng = &mut mock_rng();
async fn room_join_leave(server: Server, ref mut rng: impl RngCore) {
let rid_pub = create_room(
&server,
&ALICE_PRIV,

2
src/types.rs
View file

@ -76,7 +76,7 @@ impl<T: Serialize> WithSig<T> {
pub fn sign(
key: &SigningKey,
timestamp: u64,
rng: &mut impl RngCore,
rng: &mut (impl RngCore + ?Sized),
payload: T,
) -> Result<Self, SignatureError> {
let signee = Signee {