Skip to content

Commit 896a987

Browse files
committed
*: Remove parity-scale-codec
Given that there are no known users of the scale encoding feature, this commit removes it, making overall maintenance easier. For more details see: multiformats#118
1 parent 6da8334 commit 896a987

File tree

3 files changed

+1
-76
lines changed

3 files changed

+1
-76
lines changed

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ multihash-impl = ["derive"]
2020
derive = ["multihash-derive"]
2121
arb = ["quickcheck", "rand"]
2222
secure-hashes = ["blake2b", "blake2s", "blake3", "sha2", "sha3"]
23-
scale-codec = ["parity-scale-codec"]
2423
serde-codec = ["serde", "generic-array/serde"]
2524

2625
blake2b = ["blake2b_simd"]
@@ -33,7 +32,6 @@ strobe = ["strobe-rs"]
3332

3433
[dependencies]
3534
generic-array = "0.14.4"
36-
parity-scale-codec = { version = "1.3.5", optional = true, default-features = false, features = ["derive"] }
3735
quickcheck = { version = "0.9.2", optional = true }
3836
rand = { version = "0.7.3", optional = true }
3937
serde = { version = "1.0.116", optional = true, default-features = false, features = ["derive"] }

src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@
4141
//! The `arb` feature flag enables the quickcheck arbitrary implementation for property based
4242
//! testing.
4343
//!
44-
//! For serializing the multihash there is support for [Serde] via the `serde-codec` feature and
45-
//! the [SCALE Codec] via the `scale-codec` feature.
44+
//! For serializing the multihash there is support for [Serde] via the `serde-codec` feature.
4645
//!
4746
//! [feature flags]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
4847
//! [`Multihash` derive]: crate::derive
4948
//! [Serde]: https://serde.rs
50-
//! [SCALE Codec]: https://github.com/paritytech/parity-scale-codec
5149
5250
#![deny(missing_docs)]
5351
#![cfg_attr(not(feature = "std"), no_std)]

src/multihash.rs

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -179,66 +179,6 @@ impl<S: Size> From<Multihash<S>> for Vec<u8> {
179179
}
180180
}
181181

182-
#[cfg(feature = "scale-codec")]
183-
impl parity_scale_codec::Encode for Multihash<crate::U32> {
184-
fn encode_to<EncOut: parity_scale_codec::Output>(&self, dest: &mut EncOut) {
185-
let mut digest = [0; 32];
186-
digest.copy_from_slice(&self.digest);
187-
dest.push(&self.code);
188-
dest.push(&self.size);
189-
dest.push(&digest);
190-
}
191-
}
192-
193-
#[cfg(feature = "scale-codec")]
194-
impl parity_scale_codec::EncodeLike for Multihash<crate::U32> {}
195-
196-
#[cfg(feature = "scale-codec")]
197-
impl parity_scale_codec::Decode for Multihash<crate::U32> {
198-
fn decode<DecIn: parity_scale_codec::Input>(
199-
input: &mut DecIn,
200-
) -> Result<Self, parity_scale_codec::Error> {
201-
Ok(Multihash {
202-
code: parity_scale_codec::Decode::decode(input)?,
203-
size: parity_scale_codec::Decode::decode(input)?,
204-
digest: {
205-
let digest = <[u8; 32]>::decode(input)?;
206-
GenericArray::clone_from_slice(&digest)
207-
},
208-
})
209-
}
210-
}
211-
212-
#[cfg(feature = "scale-codec")]
213-
impl parity_scale_codec::Encode for Multihash<crate::U64> {
214-
fn encode_to<EncOut: parity_scale_codec::Output>(&self, dest: &mut EncOut) {
215-
let mut digest = [0; 64];
216-
digest.copy_from_slice(&self.digest);
217-
dest.push(&self.code);
218-
dest.push(&self.size);
219-
dest.push(&digest);
220-
}
221-
}
222-
223-
#[cfg(feature = "scale-codec")]
224-
impl parity_scale_codec::EncodeLike for Multihash<crate::U64> {}
225-
226-
#[cfg(feature = "scale-codec")]
227-
impl parity_scale_codec::Decode for Multihash<crate::U64> {
228-
fn decode<DecIn: parity_scale_codec::Input>(
229-
input: &mut DecIn,
230-
) -> Result<Self, parity_scale_codec::Error> {
231-
Ok(Multihash {
232-
code: parity_scale_codec::Decode::decode(input)?,
233-
size: parity_scale_codec::Decode::decode(input)?,
234-
digest: {
235-
let digest = <[u8; 64]>::decode(input)?;
236-
GenericArray::clone_from_slice(&digest)
237-
},
238-
})
239-
}
240-
}
241-
242182
/// Writes the multihash to a byte stream.
243183
#[cfg(feature = "std")]
244184
pub fn write_multihash<W>(mut w: W, code: u64, size: u8, digest: &[u8]) -> Result<(), Error>
@@ -299,17 +239,6 @@ mod tests {
299239
assert_eq!(hash, hash2);
300240
}
301241

302-
#[test]
303-
#[cfg(feature = "scale-codec")]
304-
fn test_scale() {
305-
use parity_scale_codec::{Decode, Encode};
306-
307-
let mh = Multihash::<crate::U32>::default();
308-
let bytes = mh.encode();
309-
let mh2: Multihash<crate::U32> = Decode::decode(&mut &bytes[..]).unwrap();
310-
assert_eq!(mh, mh2);
311-
}
312-
313242
#[test]
314243
#[cfg(feature = "serde-codec")]
315244
fn test_serde() {

0 commit comments

Comments
 (0)