grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove re-export of parking_lot in util (#6435)

Browse Source
This commit is contained in:
Hawstein
2017-09-03 02:09:13 +08:00
committed by Gav Wood
parent 1d95fe481f
commit 7b8af30590
99 changed files with 161 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/src/v1/helpers/signing_queue.rs
View File

@@ -19,7 +19,8 @@ use std::cell::RefCell;
use std::sync::Arc;
use std::collections::BTreeMap;
use jsonrpc_core;
use util::{Mutex, RwLock, U256, Address};
use parking_lot::{Mutex, RwLock};
use util::{U256, Address};
use ethcore::account_provider::DappId;
use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
use v1::types::{ConfirmationResponse, H160 as RpcH160, Origin, DappId as RpcDappId};
@@ -297,7 +298,8 @@ mod test {
use std::time::Duration;
use std::thread;
use std::sync::{mpsc, Arc};
use util::{Address, U256, Mutex};
use parking_lot::Mutex;
use util::{Address, U256};
use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
use v1::types::ConfirmationResponse;