Skip to content
Snippets Groups Projects
Unverified Commit 49c2f221 authored by dharjeezy's avatar dharjeezy
Browse files

resolving conversations

parent 12da1494
No related merge requests found
Pipeline #513129 waiting for manual action with stages
in 31 minutes and 4 seconds
......@@ -59,11 +59,11 @@ pub trait TransactionPool<H: ExHashT, B: BlockT>: Send + Sync {
/// Get transactions from the pool that are ready to be propagated.
fn transactions(&self) -> Vec<(H, Arc<B::Extrinsic>)>;
/// Get hash of transaction.
fn hash_of(&self, transaction: &Arc<B::Extrinsic>) -> H;
fn hash_of(&self, transaction: &B::Extrinsic) -> H;
/// Import a transaction into the pool.
///
/// This will return future.
fn import(&self, transaction: Arc<B::Extrinsic>) -> TransactionImportFuture;
fn import(&self, transaction: B::Extrinsic) -> TransactionImportFuture;
/// Notify the pool about transactions broadcast.
fn on_broadcasted(&self, propagations: HashMap<H, Vec<String>>);
/// Get transaction by hash.
......@@ -83,11 +83,11 @@ impl<H: ExHashT + Default, B: BlockT> TransactionPool<H, B> for EmptyTransaction
Vec::new()
}
fn hash_of(&self, _transaction: &Arc<B::Extrinsic>) -> H {
fn hash_of(&self, _transaction: &B::Extrinsic) -> H {
Default::default()
}
fn import(&self, _transaction: Arc<B::Extrinsic>) -> TransactionImportFuture {
fn import(&self, _transaction: B::Extrinsic) -> TransactionImportFuture {
Box::pin(future::ready(TransactionImport::KnownGood))
}
......
......@@ -431,7 +431,7 @@ where
break
}
let hash = self.transaction_pool.hash_of(&Arc::new(t.clone()));
let hash = self.transaction_pool.hash_of(&t);
peer.known_transactions.insert(hash.clone());
self.network.report_peer(who, rep::ANY_TRANSACTION);
......@@ -439,7 +439,7 @@ where
match self.pending_transactions_peers.entry(hash.clone()) {
Entry::Vacant(entry) => {
self.pending_transactions.push(PendingTransaction {
validation: self.transaction_pool.import(Arc::new(t)),
validation: self.transaction_pool.import(t),
tx_hash: hash,
});
entry.insert(vec![who]);
......
......@@ -510,11 +510,11 @@ where
transactions_to_propagate(&*self.pool)
}
fn hash_of(&self, transaction: &Arc<B::Extrinsic>) -> H {
self.pool.hash_of(transaction.as_ref())
fn hash_of(&self, transaction: &B::Extrinsic) -> H {
self.pool.hash_of(transaction)
}
fn import(&self, transaction: Arc<B::Extrinsic>) -> TransactionImportFuture {
fn import(&self, transaction: B::Extrinsic) -> TransactionImportFuture {
let encoded = transaction.encode();
let uxt = match Decode::decode(&mut &encoded[..]) {
Ok(uxt) => uxt,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment