Skip to content

Commit 4dc5d77

Browse files
committed
fix: more fixes for serde
1 parent 4bb8ed5 commit 4dc5d77

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

dash-spv-masternode-processor/src/bindings/keys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::processing::keys_cache::KeysCache;
2121
use crate::types::opaque_key::{AsCStringPtr, AsOpaqueKey, OpaqueKey, KeyWithUniqueId, OpaqueKeys, OpaqueSerializedKeys};
2222
use crate::util::address::address;
2323
use crate::util::sec_vec::SecVec;
24+
#[cfg(feature = "use_serde")]
2425
use serde::{Deserialize, Deserializer, Serialize, Serializer};
2526

2627
/// Destroys
@@ -503,7 +504,6 @@ pub unsafe extern "C" fn key_bls_chaincode(key: *mut BLSKey) -> ByteArray {
503504

504505
/// # Safety
505506
#[no_mangle]
506-
#[cfg(feature = "use_serde")]
507507
pub unsafe extern "C" fn key_bls_serialize(key: *mut BLSKey, legacy: bool) -> ByteArray {
508508
(&*key).bls_public_key()
509509
.map(|key| UInt384(*if legacy { key.serialize_legacy() } else { key.serialize() }))

dash-spv-masternode-processor/src/keys/bls_key.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::keys::{IKey, KeyKind, dip14::{IChildKeyDerivation, SignKey}};
88
use crate::keys::crypto_data::{CryptoData, DHKey};
99
use crate::models::OperatorPublicKey;
1010
use crate::util::{base58, data_ops::hex_with_data, sec_vec::SecVec};
11+
#[cfg(feature = "use_serde")]
1112
use serde::{Deserialize, Deserializer, Serialize, Serializer};
1213

1314
#[derive(Clone, Debug, Default)]
@@ -172,7 +173,6 @@ impl BLSKey {
172173
}
173174
}
174175

175-
#[cfg(feature = "use_serde")]
176176
pub fn key_with_seed_data(seed: &[u8], use_legacy: bool) -> Self {
177177
let bls_private_key = PrivateKey::from_bip32_seed(seed);
178178
let bls_public_key = bls_private_key.g1_element().unwrap();
@@ -556,7 +556,6 @@ fn g1_element_from_bytes(use_legacy: bool, bytes: &[u8]) -> Result<G1Element, Bl
556556
}
557557
}
558558

559-
#[cfg(feature = "use_serde")]
560559
fn g1_element_serialized(public_key: &G1Element, use_legacy: bool) -> [u8; 48] {
561560
*if use_legacy {
562561
public_key.serialize_legacy()
@@ -565,7 +564,6 @@ fn g1_element_serialized(public_key: &G1Element, use_legacy: bool) -> [u8; 48] {
565564
}
566565
}
567566

568-
#[cfg(feature = "use_serde")]
569567
fn g2_element_serialized(signature: &G2Element, use_legacy: bool) -> [u8; 96] {
570568
*if use_legacy {
571569
signature.serialize_legacy()

dash-spv-masternode-processor/src/keys/key.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::crypto::{UInt256, UInt384, UInt768};
55
use crate::keys::{BLSKey, ECDSAKey, ED25519Key, IKey};
66
use crate::types::opaque_key::{AsOpaqueKey, OpaqueKey};
77
use crate::util::sec_vec::SecVec;
8+
#[cfg(feature = "use_serde")]
89
use serde::{Deserialize, Deserializer, Serialize, Serializer};
910

1011
#[repr(C)]

dash-spv-masternode-processor/src/tests/bindings/keys.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::crypto::{UInt256, UInt384};
88
use crate::ffi::IndexPathData;
99
use crate::keys::KeyKind;
1010
use crate::types::opaque_key::OpaqueKey;
11+
#[cfg(feature = "use_serde")]
1112
use serde::{Deserialize, Deserializer, Serialize, Serializer};
1213

1314
#[test]

0 commit comments

Comments
 (0)