Bugfixing after dependency version bump

Author: dr-orlovsky

.github/workflows/build.yml

@@ -17,21 +17,17 @@ jobs:
       matrix:
         feature:
           # Library components, one by one
-          - lnp
+          - derive
           # Cryptographic optionals
           - keygen
-          - elgamal
-          - bulletproofs
-          - ed25519-dalek
           # Core rust optionals
           - serde
-          - tokio
-          - async
           # Networking
+          - tor
+          - zmq
           - url
           - websockets
-          # Full LNP strength, but without Serde
-          - lnp,websockets,url,tokio,async,keygen,bulletproofs,ed25519-dalek
+          - vendored_openssl
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies

Cargo.lock

@@ -26,7 +26,7 @@ amplify = "3.9.1"
 strict_encoding = { version = "1.7", default-features = false, features = ["derive"] }
 lightning_encoding = "0.5.0-beta.1"
 inet2_addr = { version = "0.5", features = ["strict_encoding", "stringly_conversions"], path = "./addr" }
-inet2_derive = { version = "0.5.0-rc.1", default-features = false, optional = true, path = "./derive" }
+inet2_derive = { version = "0.5.0-alpha.1", default-features = false, optional = true, path = "./derive" }
 # Dependencies on core rust-bitcoin & cryptography
 # ------------------------------------------------
 bitcoin = { version = "0.27", default-features = false, features = ["rand"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inet2_derive"
-version = "0.5.0-rc.1"
+version = "0.5.0-alpha.1"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Derivation macros for Internet2-based crates"
@@ -23,5 +23,6 @@ amplify = "3.9.1"
 amplify = "3.9.1"
 internet2 = { path = ".." }
 lnpbp = "0.5.0-beta.3"
+strict_encoding = "1.7.1"
 lightning_encoding = "0.5.0-beta.1"
 bitcoin = "0.27"

derive/Cargo.toml

@@ -282,7 +282,7 @@ impl EncodingSrategy {
                 quote_spanned!(span => #import::consensus::encode::consensus_encode(obj))
             }
             Self::Lightning => {
-                quote_spanned!(span => #import::lightning_serialize(obj))
+                quote_spanned!(span => #import::lightning_serialize(obj).expect(ERR))
             }
         }
     }

derive/src/api.rs

@@ -29,10 +29,10 @@ use syn::{
 /// should be used.
 macro_rules! attr_err {
     ($attr:expr, $msg:tt) => {
-        attr_err!($attr.span(), NAME, $msg, EXAMPLE);
+        attr_err!($attr.span(), NAME, $msg, EXAMPLE)
     };
     ($name:expr, $msg:tt, $example:tt) => {
-        attr_err!(::proc_macro2::Span::call_site(), $name, $msg, $example);
+        attr_err!(::proc_macro2::Span::call_site(), $name, $msg, $example)
     };
     ($attr:expr, $name:expr, $msg:tt, $example:tt) => {
         ::syn::Error::new(
@@ -41,7 +41,7 @@ macro_rules! attr_err {
                 "Attribute `#[{}]`: {}\nExample use: {}",
                 $name, $msg, $example
             ),
-        );
+        )
     };
 }
 

derive/src/util.rs

@@ -6,7 +6,6 @@ use std::str::FromStr;
 
 #[derive(Clone, PartialEq, Eq, Debug, Api)]
 #[api(encoding = "strict")]
-#[strict_encoding_crate(lnpbp::strict_encoding)]
 pub enum Request {
     #[api(type = 0x0001)]
     Hello(String),

derive/tests/api_strict.rs

@@ -14,7 +14,7 @@
 use crate::transport;
 
 /// Presentation-level LNP error types
-#[derive(Clone, PartialEq, Eq, Hash, Debug, Display, Error, From)]
+#[derive(Clone, PartialEq, Eq, Debug, Display, Error, From)]
 #[display(doc_comments)]
 #[non_exhaustive]
 pub enum Error {

src/presentation/error.rs

@@ -53,8 +53,8 @@ impl LightningEncode for TypeId {
     fn lightning_encode<E: io::Write>(
         &self,
         mut e: E,
-    ) -> Result<usize, io::Error> {
-        e.write(&self.0.to_be_bytes())
+    ) -> Result<usize, lightning_encoding::Error> {
+        Ok(e.write(&self.0.to_be_bytes())?)
     }
 }
 
@@ -151,7 +151,7 @@ impl LightningEncode for Payload {
     fn lightning_encode<E: io::Write>(
         &self,
         mut e: E,
-    ) -> Result<usize, io::Error> {
+    ) -> Result<usize, lightning_encoding::Error> {
         Ok(self.type_id.lightning_encode(&mut e)? + e.write(&self.payload)?)
     }
 }