Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cometbft/src/public_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ pub use crate::crypto::ed25519::VerificationKey as Ed25519;
use crate::{error::Error, prelude::*};

/// Ed25519 public key type string.
pub const PUB_KEY_TYPE_ED25519: &'static str = "tendermint/PubKeyEd25519";
pub const PUB_KEY_TYPE_ED25519: &'static str = "ed25519";
/// Secp256k1 public key type string.
#[cfg(feature = "secp256k1")]
pub const PUB_KEY_TYPE_SECP256K1: &'static str = "tendermint/PubKeySecp256k1";
pub const PUB_KEY_TYPE_SECP256K1: &'static str = "secp256k1";

// Note:On the golang side this is generic in the sense that it could everything that implements
// github.com/cometbft/cometbft/crypto.PubKey
Expand Down Expand Up @@ -653,9 +653,8 @@ mod tests {
let encoded = vec![
0x1a, 0x20, 0xd7, 0x5a, 0x98, 0x1, 0x82, 0xb1, 0xa, 0xb7, 0xd5, 0x4b, 0xfe, 0xd3,
0xc9, 0x64, 0x7, 0x3a, 0xe, 0xe1, 0x72, 0xf3, 0xda, 0xa6, 0x23, 0x25, 0xaf, 0x2,
0x1a, 0x68, 0xf7, 0x7, 0x51, 0x1a, 0x22, 0x18, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72,
0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x50, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x45, 0x64, 0x32,
0x35, 0x35, 0x31, 0x39,
0x1a, 0x68, 0xf7, 0x7, 0x51, 0x1a, 0x22, 0x7, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31,
0x39,
];

let msg = PubKeyResponse {
Expand Down
36 changes: 18 additions & 18 deletions cometbft/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -774,22 +774,22 @@ mod tests {
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "026CC7B6F3E62F789DBECEC59766888B5464737D",
"voting_power": "42",
"proposer_priority": "50",
"pub_key_bytes": "+vlsKpn6ojn+UoTZl+w+fxeqm6xvUfBokTcKfcG3au4=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A33",
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
"total_voting_power": "92"
}"#;
Expand All @@ -807,22 +807,22 @@ mod tests {
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "026CC7B6F3E62F789DBECEC59766888B5464737D",
"voting_power": "42",
"proposer_priority": "50",
"pub_key_bytes": "+vlsKpn6ojn+UoTZl+w+fxeqm6xvUfBokTcKfcG3au4=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A33",
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
}"#;

Expand All @@ -839,22 +839,22 @@ mod tests {
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "026CC7B6F3E62F789DBECEC59766888B5464737D",
"voting_power": "42",
"proposer_priority": "50",
"pub_key_bytes": "+vlsKpn6ojn+UoTZl+w+fxeqm6xvUfBokTcKfcG3au4=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A33",
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
"total_voting_power": "100"
}"#;
Expand All @@ -876,22 +876,22 @@ mod tests {
"voting_power": "576460752303423488",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "026CC7B6F3E62F789DBECEC59766888B5464737D",
"voting_power": "576460752303423488",
"proposer_priority": "50",
"pub_key_bytes": "+vlsKpn6ojn+UoTZl+w+fxeqm6xvUfBokTcKfcG3au4=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A33",
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
"total_voting_power": "92"
}"#;
Expand All @@ -913,29 +913,29 @@ mod tests {
"voting_power": "6148914691236517205",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "026CC7B6F3E62F789DBECEC59766888B5464737D",
"voting_power": "6148914691236517205",
"proposer_priority": "50",
"pub_key_bytes": "+vlsKpn6ojn+UoTZl+w+fxeqm6xvUfBokTcKfcG3au4=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
},
{
"address": "044EB1BB5D4C1CDB90029648439AEB10431FF295",
"voting_power": "6148914691236517206",
"proposer_priority": "50",
"pub_key_bytes": "Wc790fkCDAi7LvZ4UIBAIJSNI+Rp2aU80/8l+idZ/wI=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A33",
"voting_power": "50",
"proposer_priority": "-150",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"pub_key_type": "tendermint/PubKeyEd25519"
"pub_key_type": "ed25519"
}
}"#;

Expand All @@ -953,15 +953,15 @@ mod tests {
"validators": [
{
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A22",
"pub_key_type": "tendermint/PubKeyEd25519",
"pub_key_type": "ed25519",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"voting_power": "50",
"proposer_priority": "-150"
}
],
"proposer": {
"address": "01F527D77D3FFCC4FCFF2DDC2952EEA5414F2A22",
"pub_key_type": "tendermint/PubKeyEd25519",
"pub_key_type": "ed25519",
"pub_key_bytes": "OAaNq3DX/15fGJP2MI6bujt1GRpvjwrqIevChirJsbc=",
"voting_power": "50",
"proposer_priority": "-150"
Expand Down
Loading
Loading