rpc -> weak to arc (#5688)

* helpers-1

* helpers2-impls1

* small adjustments1

* cleanup-2

* small changes

* helper-impl-cleanup-finished

* test-update

* merge fix

* merge fix

* merge fix2

* fix tests

* fix tests2

* fix tests3
This commit is contained in:
Craig O'Connor
2017-05-28 08:40:36 -04:00
committed by Gav Wood
parent a246278727
commit 3991178b8d
21 changed files with 205 additions and 270 deletions

View File

@@ -226,7 +226,7 @@ impl FullDependencies {
($namespace:ident, $handler:expr, $deps:expr) => {
{
let deps = &$deps;
let dispatcher = FullDispatcher::new(Arc::downgrade(&deps.client), Arc::downgrade(&deps.miner));
let dispatcher = FullDispatcher::new(deps.client.clone(), deps.miner.clone());
if deps.signer_service.is_enabled() {
$handler.extend_with($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, dispatcher, &deps.secret_store)))
} else {
@@ -236,7 +236,7 @@ impl FullDependencies {
}
}
let dispatcher = FullDispatcher::new(Arc::downgrade(&self.client), Arc::downgrade(&self.miner));
let dispatcher = FullDispatcher::new(self.client.clone(), self.miner.clone());
for api in apis {
match *api {
Api::Web3 => {