liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

refactor

Browse Source
This commit is contained in:
John Smith
2022-07-10 17:36:50 -04:00
parent cd0cd78e30
commit 7e0d7dad06
108 changed files with 1378 additions and 1535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
veilid-core/src/tests/common/test_protected_store.rs
View File

@@ -25,55 +25,59 @@ pub async fn test_protected_store(ps: ProtectedStore) {
let d1: [u8; 0] = [];
assert_eq!(
ps.save_user_secret("_test_key", &[2u8, 3u8, 4u8]).await,
Ok(false)
ps.save_user_secret("_test_key", &[2u8, 3u8, 4u8])
.await
.unwrap(),
false
);
info!("testing saving user secret");
assert_eq!(ps.save_user_secret("_test_key", &d1).await, Ok(true));
assert_eq!(ps.save_user_secret("_test_key", &d1).await.unwrap(), true);
info!("testing loading user secret");
assert_eq!(
ps.load_user_secret("_test_key").await,
Ok(Some(d1.to_vec()))
ps.load_user_secret("_test_key").await.unwrap(),
Some(d1.to_vec())
);
info!("testing loading user secret again");
assert_eq!(
ps.load_user_secret("_test_key").await,
Ok(Some(d1.to_vec()))
ps.load_user_secret("_test_key").await.unwrap(),
Some(d1.to_vec())
);
info!("testing loading broken user secret");
assert_eq!(ps.load_user_secret("_test_broken").await, Ok(None));
assert_eq!(ps.load_user_secret("_test_broken").await.unwrap(), None);
info!("testing loading broken user secret again");
assert_eq!(ps.load_user_secret("_test_broken").await, Ok(None));
assert_eq!(ps.load_user_secret("_test_broken").await.unwrap(), None);
info!("testing remove user secret");
assert_eq!(ps.remove_user_secret("_test_key").await, Ok(true));
assert_eq!(ps.remove_user_secret("_test_key").await.unwrap(), true);
info!("testing remove user secret again");
assert_eq!(ps.remove_user_secret("_test_key").await, Ok(false));
assert_eq!(ps.remove_user_secret("_test_key").await.unwrap(), false);
info!("testing remove broken user secret");
assert_eq!(ps.remove_user_secret("_test_broken").await, Ok(false));
assert_eq!(ps.remove_user_secret("_test_broken").await.unwrap(), false);
info!("testing remove broken user secret again");
assert_eq!(ps.remove_user_secret("_test_broken").await, Ok(false));
assert_eq!(ps.remove_user_secret("_test_broken").await.unwrap(), false);
let d2: [u8; 10] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
assert_eq!(
ps.save_user_secret("_test_key", &[2u8, 3u8, 4u8]).await,
Ok(false)
ps.save_user_secret("_test_key", &[2u8, 3u8, 4u8])
.await
.unwrap(),
false
);
assert_eq!(ps.save_user_secret("_test_key", &d2).await, Ok(true));
assert_eq!(ps.save_user_secret("_test_key", &d2).await.unwrap(), true);
assert_eq!(
ps.load_user_secret("_test_key").await,
Ok(Some(d2.to_vec()))
ps.load_user_secret("_test_key").await.unwrap(),
Some(d2.to_vec())
);
assert_eq!(
ps.load_user_secret("_test_key").await,
Ok(Some(d2.to_vec()))
ps.load_user_secret("_test_key").await.unwrap(),
Some(d2.to_vec())
);
assert_eq!(ps.load_user_secret("_test_broken").await, Ok(None));
assert_eq!(ps.load_user_secret("_test_broken").await, Ok(None));
assert_eq!(ps.remove_user_secret("_test_key").await, Ok(true));
assert_eq!(ps.remove_user_secret("_test_key").await, Ok(false));
assert_eq!(ps.remove_user_secret("_test_broken").await, Ok(false));
assert_eq!(ps.remove_user_secret("_test_broken").await, Ok(false));
assert_eq!(ps.load_user_secret("_test_broken").await.unwrap(), None);
assert_eq!(ps.load_user_secret("_test_broken").await.unwrap(), None);
assert_eq!(ps.remove_user_secret("_test_key").await.unwrap(), true);
assert_eq!(ps.remove_user_secret("_test_key").await.unwrap(), false);
assert_eq!(ps.remove_user_secret("_test_broken").await.unwrap(), false);
assert_eq!(ps.remove_user_secret("_test_broken").await.unwrap(), false);
let _ = ps.remove_user_secret("_test_key").await;
let _ = ps.remove_user_secret("_test_broken").await;

45
veilid-core/src/tests/common/test_table_store.rs
View File

@@ -59,8 +59,8 @@ pub async fn test_store_delete_load(ts: TableStore) {
);
assert_eq!(
db.load(0, b"foo").await,
Ok(None),
db.load(0, b"foo").await.unwrap(),
None,
"should not load missing key"
);
assert!(
@@ -68,11 +68,14 @@ pub async fn test_store_delete_load(ts: TableStore) {
"should store new key"
);
assert_eq!(
db.load(0, b"foo").await,
Ok(None),
db.load(0, b"foo").await.unwrap(),
None,
"should not load missing key"
);
assert_eq!(db.load(1, b"foo").await, Ok(Some(b"1234567890".to_vec())));
assert_eq!(
db.load(1, b"foo").await.unwrap(),
Some(b"1234567890".to_vec())
);
assert!(
db.store(1, b"bar", b"FNORD").await.is_ok(),
@@ -97,16 +100,19 @@ pub async fn test_store_delete_load(ts: TableStore) {
"should store new key"
);
assert_eq!(db.load(1, b"bar").await, Ok(Some(b"FNORD".to_vec())));
assert_eq!(db.load(1, b"bar").await.unwrap(), Some(b"FNORD".to_vec()));
assert_eq!(
db.load(0, b"bar").await,
Ok(Some(b"ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_vec()))
db.load(0, b"bar").await.unwrap(),
Some(b"ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_vec())
);
assert_eq!(db.load(2, b"bar").await, Ok(Some(b"QWERTYUIOP".to_vec())));
assert_eq!(db.load(2, b"baz").await, Ok(Some(b"QWERTY".to_vec())));
assert_eq!(
db.load(2, b"bar").await.unwrap(),
Some(b"QWERTYUIOP".to_vec())
);
assert_eq!(db.load(2, b"baz").await.unwrap(), Some(b"QWERTY".to_vec()));
assert_eq!(db.delete(1, b"bar").await, Ok(true));
assert_eq!(db.delete(1, b"bar").await, Ok(false));
assert_eq!(db.delete(1, b"bar").await.unwrap(), true);
assert_eq!(db.delete(1, b"bar").await.unwrap(), false);
assert!(
db.delete(4, b"bar").await.is_err(),
"can't delete from column that doesn't exist"
@@ -115,13 +121,16 @@ pub async fn test_store_delete_load(ts: TableStore) {
drop(db);
let db = ts.open("test", 3).await.expect("should have opened");
assert_eq!(db.load(1, b"bar").await, Ok(None));
assert_eq!(db.load(1, b"bar").await.unwrap(), None);
assert_eq!(
db.load(0, b"bar").await,
Ok(Some(b"ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_vec()))
db.load(0, b"bar").await.unwrap(),
Some(b"ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_vec())
);
assert_eq!(db.load(2, b"bar").await, Ok(Some(b"QWERTYUIOP".to_vec())));
assert_eq!(db.load(2, b"baz").await, Ok(Some(b"QWERTY".to_vec())));
assert_eq!(
db.load(2, b"bar").await.unwrap(),
Some(b"QWERTYUIOP".to_vec())
);
assert_eq!(db.load(2, b"baz").await.unwrap(), Some(b"QWERTY".to_vec()));
}
pub async fn test_cbor(ts: TableStore) {
@@ -133,7 +142,7 @@ pub async fn test_cbor(ts: TableStore) {
assert!(db.store_cbor(0, b"asdf", &dht_key).await.is_ok());
assert_eq!(db.load_cbor::<DHTKey>(0, b"qwer").await, Ok(None));
assert_eq!(db.load_cbor::<DHTKey>(0, b"qwer").await.unwrap(), None);
let d = match db.load_cbor::<DHTKey>(0, b"asdf").await {
Ok(x) => x,