fix b58
This commit is contained in:
parent
031af6d758
commit
c710bcf16a
|
@ -2150,6 +2150,12 @@ dependencies = [
|
|||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fd_bs58"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fdaac1b30ff95de4562a79ae990f91ac7bf2062d7313cc25c58987762c8e8160"
|
||||
|
||||
[[package]]
|
||||
name = "feature-probe"
|
||||
version = "0.1.1"
|
||||
|
@ -6651,13 +6657,13 @@ dependencies = [
|
|||
"borsh 0.10.3",
|
||||
"borsh 0.9.3",
|
||||
"borsh 1.2.1",
|
||||
"bs58",
|
||||
"bv",
|
||||
"bytemuck",
|
||||
"cc",
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
"curve25519-dalek",
|
||||
"fd_bs58",
|
||||
"getrandom 0.2.10",
|
||||
"itertools",
|
||||
"js-sys",
|
||||
|
|
|
@ -17,7 +17,7 @@ blake3 = { workspace = true, features = ["digest", "traits-preview"] }
|
|||
borsh = { workspace = true }
|
||||
borsh0-10 = { package = "borsh", version = "0.10.3" }
|
||||
borsh0-9 = { package = "borsh", version = "0.9.3" }
|
||||
bs58 = "0.1.0"
|
||||
fd_bs58 = "0.1.0"
|
||||
bv = { workspace = true, features = ["serde"] }
|
||||
bytemuck = { workspace = true, features = ["derive"] }
|
||||
itertools = { workspace = true }
|
||||
|
|
|
@ -90,7 +90,6 @@ impl FromStr for Hash {
|
|||
return Err(ParseHashError::WrongSize);
|
||||
}
|
||||
let bytes = fd_bs58::decode_32(s)
|
||||
.into_vec()
|
||||
.map_err(|_| ParseHashError::Invalid)?;
|
||||
if bytes.len() != mem::size_of::<Hash>() {
|
||||
Err(ParseHashError::WrongSize)
|
||||
|
@ -194,7 +193,7 @@ mod tests {
|
|||
Err(ParseHashError::WrongSize)
|
||||
);
|
||||
|
||||
let input_too_big = bs58::encode(&[0xffu8; HASH_BYTES + 1]).into_string();
|
||||
let input_too_big = fd_bs58::encode_32(&[0xffu8; HASH_BYTES + 1]);
|
||||
assert!(input_too_big.len() > MAX_BASE58_LEN);
|
||||
assert_eq!(
|
||||
input_too_big.parse::<Hash>(),
|
||||
|
|
|
@ -111,7 +111,6 @@ impl FromStr for Hash {
|
|||
return Err(ParseHashError::WrongSize);
|
||||
}
|
||||
let bytes = fd_bs58::decode_32(s)
|
||||
.into_vec()
|
||||
.map_err(|_| ParseHashError::Invalid)?;
|
||||
if bytes.len() != mem::size_of::<Hash>() {
|
||||
Err(ParseHashError::WrongSize)
|
||||
|
@ -215,7 +214,7 @@ mod tests {
|
|||
Err(ParseHashError::WrongSize)
|
||||
);
|
||||
|
||||
let input_too_big = bs58::encode(&[0xffu8; HASH_BYTES + 1]).into_string();
|
||||
let input_too_big = fd_bs58::encode_32(&[0xffu8; HASH_BYTES + 1]);
|
||||
assert!(input_too_big.len() > MAX_BASE58_LEN);
|
||||
assert_eq!(
|
||||
input_too_big.parse::<Hash>(),
|
||||
|
|
|
@ -88,7 +88,6 @@ impl FromStr for Hash {
|
|||
return Err(ParseHashError::WrongSize);
|
||||
}
|
||||
let bytes = fd_bs58::decode_32(s)
|
||||
.into_vec()
|
||||
.map_err(|_| ParseHashError::Invalid)?;
|
||||
if bytes.len() != mem::size_of::<Hash>() {
|
||||
Err(ParseHashError::WrongSize)
|
||||
|
|
|
@ -121,7 +121,6 @@ impl FromStr for Pubkey {
|
|||
return Err(ParsePubkeyError::WrongSize);
|
||||
}
|
||||
let pubkey_vec = fd_bs58::decode_32(s)
|
||||
.into_vec()
|
||||
.map_err(|_| ParsePubkeyError::Invalid)?;
|
||||
if pubkey_vec.len() != mem::size_of::<Pubkey>() {
|
||||
Err(ParsePubkeyError::WrongSize)
|
||||
|
|
Loading…
Reference in New Issue