gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.unwrap() in tests instead of assert!()ing .is_ok() for a better failure message

Browse Source
This commit is contained in:
Michael Vines
2019-01-28 14:52:35 -08:00
parent 53afa64634
commit bfaf5634a1
19 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/native/erc20/src/token_program.rs
View File

@ -494,7 +494,7 @@ mod test {
amount: 123,
delegate: None,
});
assert!(account.serialize(&mut userdata).is_ok());
account.serialize(&mut userdata).unwrap();
assert_eq!(TokenProgram::deserialize(&userdata), Ok(account));
let account = TokenProgram::Token(TokenInfo {
@ -503,7 +503,7 @@ mod test {
name: "A test token".to_string(),
symbol: "TEST".to_string(),
});
assert!(account.serialize(&mut userdata).is_ok());
account.serialize(&mut userdata).unwrap();
assert_eq!(TokenProgram::deserialize(&userdata), Ok(account));
}

16
programs/native/storage/src/lib.rs
View File

@ -307,7 +307,7 @@ mod test {
ENTRIES_PER_SEGMENT,
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_mining_proof(
&keypair,
@ -317,7 +317,7 @@ mod test {
Signature::default(),
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
}
#[test]
@ -336,7 +336,7 @@ mod test {
ENTRIES_PER_SEGMENT,
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_mining_proof(
&keypair,
@ -345,7 +345,7 @@ mod test {
entry_height,
Signature::default(),
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_advertise_last_id(
&keypair,
@ -353,7 +353,7 @@ mod test {
Hash::default(),
ENTRIES_PER_SEGMENT * 2,
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_proof_validation(
&keypair,
@ -361,7 +361,7 @@ mod test {
entry_height,
vec![ProofStatus::Valid],
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_advertise_last_id(
&keypair,
@ -369,10 +369,10 @@ mod test {
Hash::default(),
ENTRIES_PER_SEGMENT * 3,
);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
let tx = Transaction::storage_new_reward_claim(&keypair, Hash::default(), entry_height);
assert!(test_transaction(&tx, &mut accounts).is_ok());
test_transaction(&tx, &mut accounts).unwrap();
assert!(accounts[0].tokens == TOTAL_VALIDATOR_REWARDS);
}