Improve message-signing ergonomics

This commit is contained in:
Greg Fitzgerald
2019-01-25 23:41:20 -07:00
parent 1bae87d4b3
commit 33f921235d
8 changed files with 36 additions and 39 deletions

View File

@@ -156,10 +156,7 @@ impl VoteSigner for LocalVoteSigner {
fn sign(&self, pubkey: Pubkey, sig: &Signature, msg: &[u8]) -> Result<Signature> {
verify_signature(&sig, &pubkey, &msg)?;
match self.nodes.read().unwrap().get(&pubkey) {
Some(voting_keypair) => {
let sig = Signature::new(&voting_keypair.sign(&msg).as_ref());
Ok(sig)
}
Some(voting_keypair) => Ok(voting_keypair.sign_message(&msg)),
None => Err(Error::invalid_request()),
}
}
@@ -201,7 +198,7 @@ mod tests {
let node_keypair = Keypair::new();
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
"id": 1,
@@ -238,7 +235,7 @@ mod tests {
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let msg1 = "This is a Test1";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
"id": 1,
@@ -269,7 +266,7 @@ mod tests {
let node_keypair = Keypair::new();
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
"id": 1,
@@ -301,7 +298,7 @@ mod tests {
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let msg1 = "This is a Test1";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
"id": 1,
@@ -332,7 +329,7 @@ mod tests {
let node_keypair = Keypair::new();
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
@@ -396,7 +393,7 @@ mod tests {
let node_keypair = Keypair::new();
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
"id": 1,
@@ -427,7 +424,7 @@ mod tests {
let node_keypair = Keypair::new();
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",
@@ -476,7 +473,7 @@ mod tests {
let node_pubkey = node_keypair.pubkey();
let msg = "This is a test";
let msg1 = "This is a Test";
let sig = Signature::new(&node_keypair.sign(msg.as_bytes()).as_ref());
let sig = node_keypair.sign_message(msg.as_bytes());
let req = json!({
"jsonrpc": "2.0",