Merge pull request #91 from LNP-BP/develop

Strict encoding v0.8.1 fixes

Author: dr-orlovsky

Cargo.lock

@@ -574,7 +574,7 @@ impl IntoIterator for &MerkleBlock {
     }
 }
 
-/// commitment under protocol id {0} is absent from the known part of a given
+/// commitment under protocol id {_0} is absent from the known part of a given
 /// LNPBP-4 Merkle block.
 #[derive(
     Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display, Error

commit_verify/src/lnpbp4.rs

@@ -1,6 +1,6 @@
 [package]
 name = "strict_encoding"
-version = "0.8.0"
+version = "0.8.1"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Strict encoding: deterministic binary serialization for networking & client-side validation"

strict_encoding/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "encoding_derive_helpers"
-version = "0.8.0"
+version = "0.8.1"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Helper functions for creating different encoding derivation macros"

strict_encoding/derive_helpers/Cargo.toml

@@ -256,6 +256,7 @@ fn encode_enum_impl(
         };
 
         inner_impl.append_all(quote_spanned! { variant.span() =>
+            #[allow(clippy::unnecessary_cast)]
             Self::#ident #bra_captures_ket => {
                 len += (#value as #repr).#encode_name(&mut e)?;
                 #captures

strict_encoding/derive_helpers/src/encode.rs

@@ -16,11 +16,20 @@
 
 use core::time::Duration;
 use std::io;
+use std::io::{Read, Write};
 
 use amplify::num::u24;
 
 use super::{Error, StrictDecode, StrictEncode};
 
+impl StrictEncode for () {
+    fn strict_encode<E: Write>(&self, _: E) -> Result<usize, Error> { Ok(0) }
+}
+
+impl StrictDecode for () {
+    fn strict_decode<D: Read>(_: D) -> Result<Self, Error> { Ok(()) }
+}
+
 impl StrictEncode for bool {
     fn strict_encode<E: io::Write>(&self, mut e: E) -> Result<usize, Error> {
         (*self as u8).strict_encode(&mut e)

strict_encoding/src/primitives.rs

@@ -83,7 +83,7 @@ use strict_encoding::{Error, StrictDecode, StrictEncode};
 ///
 /// NB: These errors are specific for testing configuration and should not be
 /// used in non-test environment.
-#[derive(Clone, PartialEq, Debug, Display, Error)]
+#[derive(Clone, PartialEq, Eq, Debug, Display, Error)]
 pub enum EnumEncodingTestFailure<T>
 where
     T: Clone + PartialEq + Debug,
@@ -461,7 +461,7 @@ macro_rules! test_encoding_enum_u8_exhaustive {
 ///
 /// NB: These errors are specific for testing configuration and should not be
 /// used in non-test environment.
-#[derive(Clone, PartialEq, Debug, Display, Error)]
+#[derive(Clone, PartialEq, Eq, Debug, Display, Error)]
 pub enum DataEncodingTestFailure<T>
 where
     T: StrictEncode + StrictDecode + PartialEq + Debug + Clone,