Files
pezkuwi-subxt/substrate/test-utils/transaction-factory/src/complex_mode.rs
T
Pierre Krieger 5b8ebf7baf Service factory refactor (#3382)
* Move Service::new to a macro

* Move function calls to macros

* Extract offchain_workers and start_rpc in separate function

In follow-up commits, we want to be able to directly call maintain_transaction_pool, offchain_workers, and start_rpc, without having to implement the Components trait.
This commit is a preliminary step: we extract the code to freestanding functions.

* Introduce an AbstractService trait

* Introduce NewService as an implementation detail of Service

* Implement traits on NewService instead

Instead of implementing AbstractService, Future, and Executor on Service, we implement them on NewService instead.

The implementations of AbstractService, Future, and Executor on Service still exist, but they just wrap to the respective implementations for NewService.

* Move components creation back to macro invocation

Instead of having multiple $build_ parameters passed to the macro, let's group them all into one.

This change is necessary for the follow-up commits, because we are going to call new_impl! only after all the components have already been built.

* Add a $block parameter to new_impl

This makes it possible to be explicit as what the generic parameter of the NewServiceis, without relying on type inference.

* Introduce the ServiceBuilder struct

Introduces a new builder-like ServiceBuilder struct that creates a NewService.

* Macro-ify import_blocks, export_blocks and revert_chain

Similar to the introduction of new_impl!, we extract the actual code into a macro, letting us get rid of the Components and Factory traits

* Add export_blocks, import_blocks and revert_chain methods on ServiceBuilder

Can be used as a replacement for the chain_ops::* methods

* Add run_with_builder

Instead of just run, adds run_with_builder to ParseAndPrepareExport/Import/Revert. This lets you run these operations with a ServiceBuilder instead of a ServiceFactory.

* Transition node and node-template to ServiceBuilder

* Transition transaction-factory to the new service factory

This is technically a breaking change, but the transaction-factory crate is only ever used from within substrate-node, which this commit updates as well.

* Remove old service factory

* Adjust the AbstractService trait to be more usable

We slightly change the trait bounds in order to make all the methods usable.

* Make substrate-service-test compile

* Fix the node-cli tests

* Remove the old API

* Remove the components module

* Fix indentation on chain_ops

* Line widths

* Fix bad line widths commit

* Line widths again 🤦

* Fix the sync test

* Apply suggestions from code review

Co-Authored-By: Gavin Wood <i@gavwood.com>

* Address some concerns

* Remove TelemetryOnConnect

* Remove informant::start

* Update jsonrpc

* Rename factory to builder

* Line widths 😩
2019-08-27 11:18:41 +02:00

157 lines
5.0 KiB
Rust

// Copyright 2019 Parity Technologies (UK) Ltd.
// This file is part of Substrate.
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Substrate is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
/// This module implements the `MasterToNToM` mode:
///
/// Manufacture `num` transactions from the master account to `num`
/// randomly created accounts. From each of these randomly created
/// accounts manufacture a transaction to another randomly created
/// account.
/// Repeat this round `rounds` times. If `rounds` = 1 the behavior
/// is the same as `MasterToN`.
///
/// A -> B
/// A -> C
/// A -> D
/// ... x `num`
///
/// B -> E
/// C -> F
/// D -> G
/// ...
/// E -> H
/// F -> I
/// G -> J
/// ...
/// ... x `rounds`
use std::sync::Arc;
use log::info;
use client::Client;
use client::block_builder::api::BlockBuilder;
use client::runtime_api::ConstructRuntimeApi;
use primitives::{Blake2Hasher, Hasher};
use sr_primitives::generic::BlockId;
use sr_primitives::traits::{Block as BlockT, ProvideRuntimeApi, One, Zero};
use crate::{RuntimeAdapter, create_block};
pub fn next<RA, Backend, Exec, Block, RtApi>(
factory_state: &mut RA,
client: &Arc<Client<Backend, Exec, Block, RtApi>>,
version: u32,
genesis_hash: <RA::Block as BlockT>::Hash,
prior_block_hash: <RA::Block as BlockT>::Hash,
prior_block_id: BlockId<Block>,
) -> Option<Block>
where
Block: BlockT<Hash = <Blake2Hasher as Hasher>::Out>,
Exec: client::CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone,
Backend: client::backend::Backend<Block, Blake2Hasher> + Send,
Client<Backend, Exec, Block, RtApi>: ProvideRuntimeApi,
<Client<Backend, Exec, Block, RtApi> as ProvideRuntimeApi>::Api: BlockBuilder<Block>,
RtApi: ConstructRuntimeApi<Block, Client<Backend, Exec, Block, RtApi>> + Send + Sync,
RA: RuntimeAdapter,
{
let total = factory_state.start_number() + factory_state.num() * factory_state.rounds();
if factory_state.block_no() >= total || factory_state.round() >= factory_state.rounds() {
return None;
}
info!(
"Round {}: Creating {} transactions in total, {} per round. {} rounds in total.",
factory_state.round() + RA::Number::one(),
factory_state.num() * factory_state.rounds(),
factory_state.num(),
factory_state.rounds(),
);
let from = from::<RA>(factory_state);
let seed = factory_state.start_number() + factory_state.block_no();
let to = RA::gen_random_account_id(&seed);
let rounds_left = factory_state.rounds() - factory_state.round();
let amount = RA::minimum_balance() * rounds_left.into();
let transfer = factory_state.transfer_extrinsic(
&from.0,
&from.1,
&to,
&amount,
version,
&genesis_hash,
&prior_block_hash,
);
let inherents = factory_state.inherent_extrinsics();
let inherents = client.runtime_api().inherent_extrinsics(&prior_block_id, inherents)
.expect("Failed to create inherent extrinsics");
let block = create_block::<RA, _, _, _, _>(&client, transfer, inherents);
info!(
"Created block {} with hash {}. Transferring {} from {} to {}.",
factory_state.block_no() + RA::Number::one(),
prior_block_hash,
amount,
from.0,
to
);
factory_state.set_block_no(factory_state.block_no() + RA::Number::one());
let new_round = factory_state.block_no() > RA::Number::zero()
&& factory_state.block_no() % factory_state.num() == RA::Number::zero();
if new_round {
factory_state.set_round(factory_state.round() + RA::Number::one());
factory_state.set_block_in_round(RA::Number::zero());
} else {
factory_state.set_block_in_round(factory_state.block_in_round() + RA::Number::one());
}
Some(block)
}
/// Return the account which received tokens at this point in the previous round.
fn from<RA>(
factory_state: &mut RA
) -> (<RA as RuntimeAdapter>::AccountId, <RA as RuntimeAdapter>::Secret)
where RA: RuntimeAdapter
{
let is_first_round = factory_state.round() == RA::Number::zero();
match is_first_round {
true => {
// first round always uses master account
(RA::master_account_id(), RA::master_account_secret())
},
_ => {
// the account to which was sent in the last round
let is_round_one = factory_state.round() == RA::Number::one();
let seed = match is_round_one {
true => factory_state.start_number() + factory_state.block_in_round(),
_ => {
let block_no_in_prior_round =
factory_state.num() * (factory_state.round() - RA::Number::one()) + factory_state.block_in_round();
factory_state.start_number() + block_no_in_prior_round
}
};
(RA::gen_random_account_id(&seed), RA::gen_random_account_secret(&seed))
},
}
}