Remove Instruction wrapper structs and name functions after enum fields
This commit is contained in:
@@ -21,7 +21,7 @@ impl FeeCalculator {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::pubkey::Pubkey;
|
||||
use crate::system_instruction::SystemInstruction;
|
||||
use crate::system_instruction;
|
||||
|
||||
#[test]
|
||||
fn test_fee_calculator_calculate_fee() {
|
||||
@@ -35,13 +35,13 @@ mod tests {
|
||||
// One signature, a fee.
|
||||
let pubkey0 = Pubkey::new(&[0; 32]);
|
||||
let pubkey1 = Pubkey::new(&[1; 32]);
|
||||
let ix0 = SystemInstruction::new_transfer(&pubkey0, &pubkey1, 1);
|
||||
let ix0 = system_instruction::transfer(&pubkey0, &pubkey1, 1);
|
||||
let message = Message::new(vec![ix0]);
|
||||
assert_eq!(FeeCalculator::new(2).calculate_fee(&message), 2);
|
||||
|
||||
// Two signatures, double the fee.
|
||||
let ix0 = SystemInstruction::new_transfer(&pubkey0, &pubkey1, 1);
|
||||
let ix1 = SystemInstruction::new_transfer(&pubkey1, &pubkey0, 1);
|
||||
let ix0 = system_instruction::transfer(&pubkey0, &pubkey1, 1);
|
||||
let ix1 = system_instruction::transfer(&pubkey1, &pubkey0, 1);
|
||||
let message = Message::new(vec![ix0, ix1]);
|
||||
assert_eq!(FeeCalculator::new(2).calculate_fee(&message), 4);
|
||||
}
|
||||
|
Reference in New Issue
Block a user