Rebase master

Author: xgreenx

fuel-p2p/src/behavior.rs

@@ -10,7 +10,7 @@ use crate::{
         DiscoveryEvent,
     },
     gossipsub::{
-        self,
+        build_gossipsub,
         messages::{
             GossipsubBroadcastRequest,
             GossipsubMessage as FuelGossipsubMessage,
@@ -194,7 +194,7 @@ impl<Codec: NetworkCodec> FuelBehaviour<Codec> {
 
         Self {
             discovery: discovery_config.finish(),
-            gossipsub: gossipsub::build_gossipsub(&local_keypair, p2p_config),
+            gossipsub: build_gossipsub(&local_keypair, p2p_config),
             peer_info,
             request_response,
 

fuel-txpool/src/mock_db.rs

@@ -1,14 +1,30 @@
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
+use std::{
+    borrow::Cow,
+    collections::HashMap,
+    sync::{
+        Arc,
+        Mutex,
+    },
+};
 
 use fuel_core_interfaces::{
     common::{
         fuel_storage::Storage,
-        fuel_tx::{Contract, ContractId, MessageId, UtxoId},
+        fuel_tx::{
+            Contract,
+            ContractId,
+            MessageId,
+            UtxoId,
+        },
+    },
+    db::{
+        Error,
+        KvStoreError,
+    },
+    model::{
+        Coin,
+        Message,
     },
-    db::{Error, KvStoreError},
-    model::{Coin, Message},
     txpool::TxPoolDb,
 };
 
@@ -27,7 +43,11 @@ pub(crate) struct MockDb {
 impl Storage<UtxoId, Coin> for MockDb {
     type Error = KvStoreError;
 
-    fn insert(&mut self, key: &UtxoId, value: &Coin) -> Result<Option<Coin>, Self::Error> {
+    fn insert(
+        &mut self,
+        key: &UtxoId,
+        value: &Coin,
+    ) -> Result<Option<Coin>, Self::Error> {
         Ok(self.data.lock().unwrap().coins.insert(*key, value.clone()))
     }
 
@@ -88,7 +108,11 @@ impl Storage<ContractId, Contract> for MockDb {
 impl Storage<MessageId, Message> for MockDb {
     type Error = KvStoreError;
 
-    fn insert(&mut self, key: &MessageId, value: &Message) -> Result<Option<Message>, Self::Error> {
+    fn insert(
+        &mut self,
+        key: &MessageId,
+        value: &Message,
+    ) -> Result<Option<Message>, Self::Error> {
         Ok(self
             .data
             .lock()

fuel-txpool/src/service.rs

@@ -1,10 +1,27 @@
-use crate::{Config, TxPool};
+use crate::{
+    Config,
+    TxPool,
+};
 use anyhow::anyhow;
-use fuel_core_interfaces::block_importer::ImportBlockBroadcast;
-use fuel_core_interfaces::txpool::{self, TxPoolDb, TxPoolMpsc, TxStatusBroadcast};
+use fuel_core_interfaces::{
+    block_importer::ImportBlockBroadcast,
+    txpool::{
+        self,
+        TxPoolDb,
+        TxPoolMpsc,
+        TxStatusBroadcast,
+    },
+};
 use std::sync::Arc;
-use tokio::sync::{broadcast, mpsc, Mutex, RwLock};
-use tokio::task::JoinHandle;
+use tokio::{
+    sync::{
+        broadcast,
+        mpsc,
+        Mutex,
+        RwLock,
+    },
+    task::JoinHandle,
+};
 
 pub struct ServiceBuilder {
     sender: txpool::Sender,
@@ -63,7 +80,7 @@ impl ServiceBuilder {
 
     pub fn build(self) -> anyhow::Result<Service> {
         if self.db.is_none() || self.import_block_events.is_none() {
-            return Err(anyhow!("One of context items are not set"));
+            return Err(anyhow!("One of context items are not set"))
         }
         let service = Service::new(
             self.sender,
@@ -207,7 +224,10 @@ pub mod tests {
     use crate::MockDb;
     use fuel_core_interfaces::{
         common::fuel_tx::TransactionBuilder,
-        txpool::{Error as TxpoolError, TxStatus},
+        txpool::{
+            Error as TxpoolError,
+            TxStatus,
+        },
     };
     use tokio::sync::oneshot;
 
@@ -416,7 +436,8 @@ pub mod tests {
         let _rem = receiver.await.unwrap();
 
         assert_eq!(
-            tokio::time::timeout(std::time::Duration::from_secs(2), subscribe.recv()).await,
+            tokio::time::timeout(std::time::Duration::from_secs(2), subscribe.recv())
+                .await,
             Ok(Ok(TxStatusBroadcast {
                 tx: tx1,
                 status: TxStatus::SqueezedOut {
@@ -427,7 +448,8 @@ pub mod tests {
         );
 
         assert_eq!(
-            tokio::time::timeout(std::time::Duration::from_secs(2), subscribe.recv()).await,
+            tokio::time::timeout(std::time::Duration::from_secs(2), subscribe.recv())
+                .await,
             Ok(Ok(TxStatusBroadcast {
                 tx: tx2,
                 status: TxStatus::SqueezedOut {