Skip to content

Commit 583beac

Browse files
[merlin, zk-sdk] Turn default-features for merlin crate to false (#4469)
turn default-features for `merlin` crate to false
1 parent 1d1e1c1 commit 583beac

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
inherits = "release"
33
debug = true
44
split-debuginfo = "packed"
5-
lto = false # Preserve the 'thin local LTO' for this build.
5+
lto = false # Preserve the 'thin local LTO' for this build.
66

77
[profile.release]
88
split-debuginfo = "unpacked"
@@ -374,7 +374,7 @@ lru = "0.7.7"
374374
lz4 = "1.28.1"
375375
memmap2 = "0.5.10"
376376
memoffset = "0.9"
377-
merlin = "3"
377+
merlin = { version = "3", default-features = false }
378378
min-max-heap = "1.3.0"
379379
mockall = "0.11.4"
380380
modular-bitfield = "0.11.2"

zk-sdk/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub mod errors;
2424
pub mod pod;
2525
mod range_proof;
2626
mod sigma_proofs;
27+
#[cfg(not(target_os = "solana"))]
2728
mod transcript;
2829
pub mod zk_elgamal_proof_program;
2930

zk-sdk/src/transcript.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
use merlin::Transcript;
2-
#[cfg(not(target_os = "solana"))]
31
use {
42
crate::errors::TranscriptError,
53
curve25519_dalek::{ristretto::CompressedRistretto, scalar::Scalar, traits::IsIdentity},
4+
merlin::Transcript,
65
};
76

87
pub trait TranscriptProtocol {

0 commit comments

Comments
 (0)