small fixes

Author: elpiel

primitives/src/postgres/field/channel_id.rs

@@ -1,6 +1,7 @@
 use std::error::Error;
 
 use crate::ChannelId;
+use hex::FromHex;
 use postgres_types::{FromSql, Type};
 
 #[derive(Debug)]
@@ -16,16 +17,8 @@ impl<'a> FromSql<'a> for ChannelIdPg {
     fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<ChannelIdPg, Box<dyn Error + Sync + Send>> {
         let str_slice = <&str as FromSql>::from_sql(ty, raw)?;
 
-        // @TODO: Add this check back!
-        //        if result.len() != 32 {
-        //            return Err(DomainError::InvalidArgument(format!(
-        //                "Invalid validator id value {}",
-        //                value
-        //            )));
-        //        }
-
-        let mut id: [u8; 32] = [0; 32];
-        id.copy_from_slice(&hex::decode(str_slice)?);
+        // FromHex::from_hex for fixed-sized arrays will guard against the length of the string!
+        let id: [u8; 32] = <[u8; 32] as FromHex>::from_hex(str_slice)?;
 
         Ok(ChannelIdPg(id.into()))
     }

sentry/src/middleware/channel.rs

@@ -1,4 +1,4 @@
-use crate::db::field::{BigNumPg, ChannelIdPg};
+use primitives::postgres::field::{BigNumPg, ChannelIdPg};
 use crate::db::DbPool;
 use bb8_postgres::tokio_postgres::{types::Json, Row};
 use hyper::{Body, Request};