Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
SDK: refactor Signer and Signers traits (#34984)
Browse files Browse the repository at this point in the history 
* read_keypair_file\((.+?)\)[\n\r\s]+.unwrap\(\)[\n\r\s]+.into\(\) -> Box::new(read_keypair_file().unwrap()), Presigner::new\((.*?)\).into\(\) -> Box::new(Presigner::new())

* compiles

* moar general

* doc

* Result impls FromIterator

* doc
  • Loading branch information
@billythedummy
billythedummy authored Mar 1, 2024
1 parent 9bb59aa commit e3b9d7f
Show file tree
Hide file tree
Showing 10 changed files with 301 additions and 448 deletions.
43 changes: 24 additions & 19 deletions cli/src/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,11 @@ mod tests {
let keypair0_pubkey = keypair0.pubkey();
let keypair0_clone = keypair_from_seed(&[1u8; 32]).unwrap();
let keypair0_clone_pubkey = keypair0.pubkey();
let signers = vec![None, Some(keypair0.into()), Some(keypair0_clone.into())];
let signers: Vec<Option<Box<dyn Signer>>> = vec![
None,
Some(Box::new(keypair0)),
Some(Box::new(keypair0_clone)),
];
let signer_info = default_signer
.generate_unique_signers(signers, &matches, &mut None)
.unwrap();
Expand All @@ -1808,7 +1812,8 @@ mod tests {
let keypair0 = keypair_from_seed(&[1u8; 32]).unwrap();
let keypair0_pubkey = keypair0.pubkey();
let keypair0_clone = keypair_from_seed(&[1u8; 32]).unwrap();
let signers = vec![Some(keypair0.into()), Some(keypair0_clone.into())];
let signers: Vec<Option<Box<dyn Signer>>> =
vec![Some(Box::new(keypair0)), Some(Box::new(keypair0_clone))];
let signer_info = default_signer
.generate_unique_signers(signers, &matches, &mut None)
.unwrap();
Expand All @@ -1825,11 +1830,11 @@ mod tests {
let presigner0_pubkey = presigner0.pubkey();
let presigner1 = Presigner::new(&keypair1.pubkey(), &keypair1.sign_message(&message));
let presigner1_pubkey = presigner1.pubkey();
let signers = vec![
Some(keypair0.into()),
Some(presigner0.into()),
Some(presigner1.into()),
Some(keypair1.into()),
let signers: Vec<Option<Box<dyn Signer>>> = vec![
Some(Box::new(keypair0)),
Some(Box::new(presigner0)),
Some(Box::new(presigner1)),
Some(Box::new(keypair1)),
];
let signer_info = default_signer
.generate_unique_signers(signers, &matches, &mut None)
Expand Down Expand Up @@ -1913,7 +1918,7 @@ mod tests {
pubkey: None,
use_lamports_unit: true,
},
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -1978,7 +1983,7 @@ mod tests {
seed: "seed".to_string(),
program_id: stake::program::id(),
},
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -2020,7 +2025,7 @@ mod tests {
command: CliCommand::SignOffchainMessage {
message: message.clone()
},
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&keypair_file).unwrap())],
}
);

Expand All @@ -2040,7 +2045,7 @@ mod tests {
signature,
message
},
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&keypair_file).unwrap())],
}
);
}
Expand Down Expand Up @@ -2460,7 +2465,7 @@ mod tests {
derived_address_program_id: None,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -2488,7 +2493,7 @@ mod tests {
derived_address_program_id: None,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -2521,7 +2526,7 @@ mod tests {
derived_address_program_id: None,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -2557,7 +2562,7 @@ mod tests {
derived_address_program_id: None,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -2601,7 +2606,7 @@ mod tests {
derived_address_program_id: None,
compute_unit_price: None,
},
signers: vec![Presigner::new(&from_pubkey, &from_sig).into()],
signers: vec![Box::new(Presigner::new(&from_pubkey, &from_sig))],
}
);

Expand Down Expand Up @@ -2647,8 +2652,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&nonce_authority_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&nonce_authority_file).unwrap())
],
}
);
Expand Down Expand Up @@ -2686,7 +2691,7 @@ mod tests {
derived_address_program_id: Some(stake::program::id()),
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into(),],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap()),],
}
);
}
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cluster_query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2399,7 +2399,7 @@ mod tests {
print_timestamp: true,
compute_unit_price: None,
},
signers: vec![default_keypair.into()],
signers: vec![Box::new(default_keypair)],
}
);
}
Expand Down
30 changes: 15 additions & 15 deletions cli/src/nonce.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ mod tests {
new_authority: Pubkey::default(),
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand All @@ -752,8 +752,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&authority_keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&authority_keypair_file).unwrap())
],
}
);
Expand All @@ -777,8 +777,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&keypair_file).unwrap())
],
}
);
Expand All @@ -804,8 +804,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&keypair_file).unwrap())
],
}
);
Expand Down Expand Up @@ -839,7 +839,7 @@ mod tests {
memo: None,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand All @@ -862,8 +862,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&authority_keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&authority_keypair_file).unwrap())
],
}
);
Expand Down Expand Up @@ -909,7 +909,7 @@ mod tests {
lamports: 42_000_000_000,
compute_unit_price: None,
},
signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
signers: vec![Box::new(read_keypair_file(&default_keypair_file).unwrap())],
}
);

Expand Down Expand Up @@ -940,8 +940,8 @@ mod tests {
compute_unit_price: None,
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&authority_keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&authority_keypair_file).unwrap())
],
}
);
Expand Down Expand Up @@ -986,8 +986,8 @@ mod tests {
compute_unit_price: Some(99),
},
signers: vec![
read_keypair_file(&default_keypair_file).unwrap().into(),
read_keypair_file(&authority_keypair_file).unwrap().into()
Box::new(read_keypair_file(&default_keypair_file).unwrap()),
Box::new(read_keypair_file(&authority_keypair_file).unwrap())
],
}
);
Expand Down
Loading

0 comments on commit e3b9d7f

Please sign in to comment.