A set of fixes and features for wit\2

bridges/centralized-ethereum/src/actors/dr_sender/tests.rs

@@ -4,14 +4,14 @@ use witnet_data_structures::chain::{RADAggregate, RADRequest, RADRetrieve, RADTa
 #[test]
 fn deserialize_empty_dr() {
     // An empty data request is invalid with error 0xE0: BridgeMalformedRequest
-    let err = deserialize_and_validate_dr_bytes(&[], 1).unwrap_err();
+    let err = deserialize_and_validate_dr_bytes(&[], 0, 1).unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
 }
 
 #[test]
 fn deserialize_dr_not_protobuf() {
     // A malformed data request is invalid with error 0xE0: BridgeMalformedRequest
-    let err = deserialize_and_validate_dr_bytes(&[1, 2, 3, 4], 1).unwrap_err();
+    let err = deserialize_and_validate_dr_bytes(&[1, 2, 3, 4], 0, 1).unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
 }
 
@@ -55,7 +55,8 @@ fn deserialize_dr_high_value() {
     let dro_bytes = dro.to_pb_bytes().unwrap();
     // Setting the maximum allowed value to 1 nanowit below that will result in an error 0xE1:
     // BridgePoorIncentives
-    let err = deserialize_and_validate_dr_bytes(&dro_bytes, total_value - 1).unwrap_err();
+    let err =
+        deserialize_and_validate_dr_bytes(&dro_bytes, 1_000_000_000, total_value - 1).unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 225]);
 }
 
@@ -78,7 +79,7 @@ fn deserialize_dr_collateral_one_nanowit() {
     assert_eq!(total_value, 20_000_000);
 
     let dro_bytes = dro.to_pb_bytes().unwrap();
-    let err = deserialize_and_validate_dr_bytes(&dro_bytes, total_value).unwrap_err();
+    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 1, total_value).unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
 }
 
@@ -95,7 +96,7 @@ fn deserialize_dr_value_overflow() {
     };
 
     let dro_bytes = dro.to_pb_bytes().unwrap();
-    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 1).unwrap_err();
+    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 0, 1).unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
 }
 
@@ -115,6 +116,7 @@ fn deserialize_and_validate_dr_bytes_wip_0022() {
     let dro_bytes = dro.to_pb_bytes().unwrap();
     let witnet_dr_max_value_nanowits = 100_000_000_000;
     let err =
-        deserialize_and_validate_dr_bytes(&dro_bytes, witnet_dr_max_value_nanowits).unwrap_err();
+        deserialize_and_validate_dr_bytes(&dro_bytes, 1_000_000_000, witnet_dr_max_value_nanowits)
+            .unwrap_err();
     assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
 }

bridges/centralized-ethereum/src/main.rs

@@ -119,7 +119,10 @@ fn run(callback: fn()) -> Result<(), String> {
 
         // Initialize Storage Manager
         let mut node_config = NodeConfig::default();
-        node_config.storage.db_path = config.storage.db_path.clone();
+        node_config
+            .storage
+            .db_path
+            .clone_from(&config.storage.db_path);
         storage_mngr::start_from_config(node_config);
     });
 

data_structures/src/chain/mod.rs

@@ -1642,7 +1642,7 @@ impl KeyedSignature {
         compact: &[u8],
         message: &[u8],
     ) -> Result<Self, Secp256k1ConversionError> {
-        let recid = RecoveryId::from_i32(compact[0] as i32)
+        let recid = RecoveryId::from_i32(i32::from(compact[0]))
             .map_err(|e| Secp256k1ConversionError::Secp256k1 { inner: e })?;
         let recoverable = RecoverableSignature::from_compact(&compact[1..], recid)
             .map_err(|e| Secp256k1ConversionError::Secp256k1 { inner: e })?;

data_structures/src/staking/errors.rs

@@ -1,4 +1,4 @@
-use crate::staking::aux::StakeKey;
+use crate::staking::helpers::StakeKey;
 use failure::Fail;
 use std::{
     convert::From,

data_structures/src/staking/mod.rs

@@ -1,11 +1,11 @@
 #![deny(missing_docs)]
 
-/// Auxiliary convenience types and data structures.
-pub mod helpers;
 /// Constants related to the staking functionality.
 pub mod constants;
 /// Errors related to the staking functionality.
 pub mod errors;
+/// Auxiliary convenience types and data structures.
+pub mod helpers;
 /// The data structure and related logic for stake entries.
 pub mod stake;
 /// The data structure and related logic for keeping track of multiple stake entries.
@@ -16,9 +16,9 @@ pub mod stakes;
 pub mod prelude {
     pub use crate::capabilities::*;
 
-    pub use super::helpers::*;
     pub use super::constants::*;
     pub use super::errors::*;
+    pub use super::helpers::*;
     pub use super::stake::*;
     pub use super::stakes::*;
 }

data_structures/src/staking/stake.rs

@@ -79,6 +79,7 @@ where
         let product_added = coins * epoch;
 
         let coins_after = coins_before + coins;
+        #[allow(clippy::cast_possible_truncation)]
         let epoch_after = Epoch::from(
             (u64::from(product_before + product_added) / u64::from(coins_after)) as u32,
         );