chore: Format includes

Author: lrubiorod

data_structures/src/chain.rs

@@ -39,11 +39,9 @@ use crate::{
     proto::{schema::witnet, ProtobufConvert},
     superblock::SuperBlockState,
     transaction::{
-        CommitTransaction, DRTransaction, DRTransactionBody, Memoized, MintTransaction,
-        RevealTransaction, TallyTransaction, Transaction, TxInclusionProof, VTTransaction,
-    },
-    transaction::{
-        MemoHash, MemoizedHashable, BETA, COMMIT_WEIGHT, OUTPUT_SIZE, REVEAL_WEIGHT, TALLY_WEIGHT,
+        CommitTransaction, DRTransaction, DRTransactionBody, MemoHash, Memoized, MemoizedHashable,
+        MintTransaction, RevealTransaction, TallyTransaction, Transaction, TxInclusionProof,
+        VTTransaction, BETA, COMMIT_WEIGHT, OUTPUT_SIZE, REVEAL_WEIGHT, TALLY_WEIGHT,
     },
     utxo_pool::{OldUnspentOutputsPool, OwnUnspentOutputsPool, UnspentOutputsPool},
     vrf::{BlockEligibilityClaim, DataRequestEligibilityClaim},

data_structures/src/transaction.rs

@@ -9,8 +9,10 @@ use crate::{
     vrf::DataRequestEligibilityClaim,
 };
 use protobuf::Message;
-use std::convert::TryFrom;
-use std::sync::{Arc, RwLock};
+use std::{
+    convert::TryFrom,
+    sync::{Arc, RwLock},
+};
 use witnet_crypto::{hash::calculate_sha256, merkle::FullMerkleTree};
 
 // These constants were calculated in:

node/src/actors/chain_manager/handlers.rs

@@ -24,18 +24,18 @@ use witnet_util::timestamp::get_timestamp;
 use witnet_validations::validations::{block_reward, total_block_reward, validate_rad_request};
 
 use super::{ChainManager, ChainManagerError, StateMachine, SyncTarget};
-use crate::actors::messages::BuildScriptTransaction;
 use crate::{
     actors::{
         chain_manager::{handlers::BlockBatches::*, BlockCandidate},
         messages::{
             AddBlocks, AddCandidates, AddCommitReveal, AddSuperBlock, AddSuperBlockVote,
-            AddTransaction, Broadcast, BuildDrt, BuildVtt, EpochNotification, GetBalance,
-            GetBlocksEpochRange, GetDataRequestInfo, GetHighestCheckpointBeacon,
-            GetMemoryTransaction, GetMempool, GetMempoolResult, GetNodeStats, GetReputation,
-            GetReputationResult, GetSignalingInfo, GetState, GetSuperBlockVotes, GetSupplyInfo,
-            GetUtxoInfo, IsConfirmedBlock, PeersBeacons, ReputationStats, Rewind, SendLastBeacon,
-            SessionUnitResult, SetLastBeacon, SetPeersLimits, SignalingInfo, TryMineBlock,
+            AddTransaction, Broadcast, BuildDrt, BuildScriptTransaction, BuildVtt,
+            EpochNotification, GetBalance, GetBlocksEpochRange, GetDataRequestInfo,
+            GetHighestCheckpointBeacon, GetMemoryTransaction, GetMempool, GetMempoolResult,
+            GetNodeStats, GetReputation, GetReputationResult, GetSignalingInfo, GetState,
+            GetSuperBlockVotes, GetSupplyInfo, GetUtxoInfo, IsConfirmedBlock, PeersBeacons,
+            ReputationStats, Rewind, SendLastBeacon, SessionUnitResult, SetLastBeacon,
+            SetPeersLimits, SignalingInfo, TryMineBlock,
         },
         sessions_manager::SessionsManager,
     },

node/src/actors/messages.rs

@@ -15,11 +15,10 @@ use actix::{
 use serde::{Deserialize, Serialize};
 use tokio::net::TcpStream;
 
-use witnet_data_structures::chain::Input;
 use witnet_data_structures::{
     chain::{
         Block, CheckpointBeacon, DataRequestInfo, DataRequestOutput, Epoch, EpochConstants, Hash,
-        InventoryEntry, InventoryItem, NodeStats, PointerToBlock, PublicKeyHash, RADRequest,
+        Input, InventoryEntry, InventoryItem, NodeStats, PointerToBlock, PublicKeyHash, RADRequest,
         RADTally, Reputation, StateMachine, SuperBlock, SuperBlockVote, SupplyInfo,
         ValueTransferOutput,
     },

src/cli/node/json_rpc_client.rs

@@ -20,11 +20,10 @@ use witnet_crypto::{
     hash::calculate_sha256,
     key::{CryptoEngine, ExtendedPK, ExtendedSK},
 };
-use witnet_data_structures::chain::Input;
 use witnet_data_structures::{
     chain::{
         Block, ConsensusConstants, DataRequestInfo, DataRequestOutput, Environment, Epoch, Hash,
-        Hashable, InventoryItem, KeyedSignature, NodeStats, OutputPointer, PublicKey,
+        Hashable, Input, InventoryItem, KeyedSignature, NodeStats, OutputPointer, PublicKey,
         PublicKeyHash, StateMachine, SupplyInfo, SyncStatus, ValueTransferOutput,
     },
     mainnet_validations::{current_active_wips, ActiveWips},
@@ -33,13 +32,12 @@ use witnet_data_structures::{
     transaction_factory::NodeBalance,
     utxo_pool::{UtxoInfo, UtxoSelectionStrategy},
 };
-use witnet_node::actors::messages::BuildScriptTransaction;
 use witnet_node::actors::{
     chain_manager::run_dr_locally,
     json_rpc::json_rpc_methods::{
         AddrType, GetBalanceParams, GetBlockChainParams, GetTransactionOutput, PeersResult,
     },
-    messages::{BuildVtt, GetReputationResult, SignalingInfo},
+    messages::{BuildScriptTransaction, BuildVtt, GetReputationResult, SignalingInfo},
 };
 use witnet_rad::types::RadonTypes;
 use witnet_stack::{Item, MyOperator, MyValue};

validations/src/validations.rs

@@ -13,8 +13,6 @@ use witnet_crypto::{
     merkle::{merkle_tree_root as crypto_merkle_tree_root, ProgressiveMerkleTree},
     signature::{verify, PublicKey, Signature},
 };
-use witnet_data_structures::proto::ProtobufConvert;
-use witnet_data_structures::transaction::{vtt_signature_to_witness, vtt_witness_to_signature};
 use witnet_data_structures::{
     chain::{
         Block, BlockMerkleRoots, CheckpointBeacon, CheckpointVRF, ConsensusConstants,
@@ -28,10 +26,11 @@ use witnet_data_structures::{
     },
     error::{BlockError, DataRequestError, TransactionError},
     mainnet_validations::ActiveWips,
+    proto::ProtobufConvert,
     radon_report::{RadonReport, ReportContext},
     transaction::{
-        CommitTransaction, DRTransaction, MintTransaction, RevealTransaction, TallyTransaction,
-        Transaction, VTTransaction,
+        vtt_signature_to_witness, vtt_witness_to_signature, CommitTransaction, DRTransaction,
+        MintTransaction, RevealTransaction, TallyTransaction, Transaction, VTTransaction,
     },
     transaction_factory::{transaction_inputs_sum, transaction_outputs_sum},
     utxo_pool::{Diff, UnspentOutputsPool, UtxoDiff},