Skip to content

Commit 52c98c7

Browse files
authored
Move test functions into test module (#248)
1 parent 6df4ce5 commit 52c98c7

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

src/lib.rs

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ pub use self::{
126126
};
127127

128128
#[cfg(test)]
129-
use strum::IntoDiscriminant;
129+
use {
130+
strum::IntoDiscriminant,
131+
test::{assert_cbor, assert_encoding, tempdir},
132+
};
130133

131134
#[macro_export]
132135
macro_rules! assert_matches {
@@ -245,35 +248,6 @@ const BECH32_VERSION: Fe32 = Fe32::A;
245248

246249
type Result<T = (), E = Error> = std::result::Result<T, E>;
247250

248-
#[cfg(test)]
249-
fn tempdir() -> tempfile::TempDir {
250-
tempfile::Builder::new()
251-
.prefix("filepack-test-tempdir")
252-
.tempdir()
253-
.unwrap()
254-
}
255-
256-
#[cfg(test)]
257-
#[track_caller]
258-
fn assert_cbor<T: Debug + Decode + Encode + PartialEq>(value: T, cbor: &[u8]) {
259-
let buffer = value.encode_to_vec();
260-
assert_eq!(buffer, cbor);
261-
let mut decoder = Decoder::new(&buffer);
262-
let decoded = T::decode(&mut decoder).unwrap();
263-
decoder.finish().unwrap();
264-
assert_eq!(decoded, value);
265-
}
266-
267-
#[cfg(test)]
268-
#[track_caller]
269-
fn assert_encoding<T: Debug + Decode + Encode + PartialEq>(value: T) {
270-
let buffer = value.encode_to_vec();
271-
let mut decoder = Decoder::new(&buffer);
272-
let decoded = T::decode(&mut decoder).unwrap();
273-
decoder.finish().unwrap();
274-
assert_eq!(decoded, value);
275-
}
276-
277251
pub fn run() {
278252
if let Err(err) = Arguments::parse().run() {
279253
let style = Style::stderr();

src/test.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,25 @@ pub(crate) const SIGNATURE: &str = concat!(
2222
pub(crate) const WEAK_PUBLIC_KEY: &str =
2323
"public1aqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqsqtuc8";
2424

25+
#[track_caller]
26+
pub(crate) fn assert_cbor<T: Debug + Decode + Encode + PartialEq>(value: T, cbor: &[u8]) {
27+
let buffer = value.encode_to_vec();
28+
assert_eq!(buffer, cbor);
29+
let mut decoder = Decoder::new(&buffer);
30+
let decoded = T::decode(&mut decoder).unwrap();
31+
decoder.finish().unwrap();
32+
assert_eq!(decoded, value);
33+
}
34+
35+
#[track_caller]
36+
pub(crate) fn assert_encoding<T: Debug + Decode + Encode + PartialEq>(value: T) {
37+
let buffer = value.encode_to_vec();
38+
let mut decoder = Decoder::new(&buffer);
39+
let decoded = T::decode(&mut decoder).unwrap();
40+
decoder.finish().unwrap();
41+
assert_eq!(decoded, value);
42+
}
43+
2544
pub(crate) fn checksum(s: &str) -> String {
2645
let checked_hrpstring = CheckedHrpstring::new::<bech32::NoChecksum>(s).unwrap();
2746
checked_hrpstring
@@ -58,3 +77,10 @@ fn signature_matches() {
5877
let signature = private_key.sign(&message);
5978
assert_eq!(signature.to_string(), SIGNATURE);
6079
}
80+
81+
pub(crate) fn tempdir() -> tempfile::TempDir {
82+
tempfile::Builder::new()
83+
.prefix("filepack-test-tempdir")
84+
.tempdir()
85+
.unwrap()
86+
}

0 commit comments

Comments
 (0)