Commit 2955e47e authored by Gav's avatar Gav
Browse files

Merge branch 'master' into gav-compat-624

parents 63d13a0c 5a684a58
This diff is collapsed.
...@@ -5,29 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"] ...@@ -5,29 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust." description = "Polkadot node implementation in Rust."
[dependencies] [dependencies]
clap = { version = "~2.32", features = ["yaml"] }
error-chain = "0.12"
log = "0.3" log = "0.3"
slog = "^2"
lazy_static = "1.0"
tokio = "0.1.7" tokio = "0.1.7"
futures = "0.1.17" futures = "0.1.17"
parking_lot = "0.4"
exit-future = "0.1" exit-future = "0.1"
substrate-cli = { git = "https://github.com/paritytech/substrate" } substrate-cli = { git = "https://github.com/paritytech/substrate" }
substrate-client = { git = "https://github.com/paritytech/substrate" }
substrate-codec = { git = "https://github.com/paritytech/substrate" }
substrate-extrinsic-pool = { git = "https://github.com/paritytech/substrate" }
substrate-network = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-rpc = { git = "https://github.com/paritytech/substrate" }
substrate-rpc-servers = { git = "https://github.com/paritytech/substrate" }
substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-service = { git = "https://github.com/paritytech/substrate" }
substrate-state-machine = { git = "https://github.com/paritytech/substrate" }
substrate-telemetry = { git = "https://github.com/paritytech/substrate" }
polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" }
polkadot-service = { path = "../service" } polkadot-service = { path = "../service" }
polkadot-transaction-pool = { path = "../transaction-pool" }
...@@ -231,7 +231,10 @@ fn make_group_info(roster: DutyRoster, authorities: &[AuthorityId], local_id: Au ...@@ -231,7 +231,10 @@ fn make_group_info(roster: DutyRoster, authorities: &[AuthorityId], local_id: Au
} }
/// Polkadot proposer factory. /// Polkadot proposer factory.
pub struct ProposerFactory<C, N, P> { pub struct ProposerFactory<C, N, P>
where
P: PolkadotApi + Send + Sync + 'static
{
/// The client instance. /// The client instance.
pub client: Arc<P>, pub client: Arc<P>,
/// The transaction pool. /// The transaction pool.
...@@ -407,7 +410,7 @@ struct LocalDuty { ...@@ -407,7 +410,7 @@ struct LocalDuty {
} }
/// The Polkadot proposer logic. /// The Polkadot proposer logic.
pub struct Proposer<C: PolkadotApi> { pub struct Proposer<C: PolkadotApi + Send + Sync> {
client: Arc<C>, client: Arc<C>,
dynamic_inclusion: DynamicInclusion, dynamic_inclusion: DynamicInclusion,
local_key: Arc<ed25519::Pair>, local_key: Arc<ed25519::Pair>,
...@@ -587,10 +590,10 @@ impl<C> bft::Proposer<Block> for Proposer<C> ...@@ -587,10 +590,10 @@ impl<C> bft::Proposer<Block> for Proposer<C>
let local_id = self.local_key.public().0.into(); let local_id = self.local_key.public().0.into();
let mut next_index = { let mut next_index = {
let cur_index = self.transaction_pool.cull_and_get_pending(BlockId::hash(self.parent_hash), |pending| pending let cur_index = self.transaction_pool.cull_and_get_pending(&BlockId::hash(self.parent_hash), |pending| pending
.filter(|tx| tx.sender().map(|s| s == local_id).unwrap_or(false)) .filter(|tx| tx.verified.sender().map(|s| s == local_id).unwrap_or(false))
.last() .last()
.map(|tx| Ok(tx.index())) .map(|tx| Ok(tx.verified.index()))
.unwrap_or_else(|| self.client.index(&self.parent_id, local_id)) .unwrap_or_else(|| self.client.index(&self.parent_id, local_id))
); );
...@@ -636,9 +639,8 @@ impl<C> bft::Proposer<Block> for Proposer<C> ...@@ -636,9 +639,8 @@ impl<C> bft::Proposer<Block> for Proposer<C>
index: extrinsic.index, index: extrinsic.index,
function: extrinsic.function, function: extrinsic.function,
}; };
let uxt = UncheckedExtrinsic::new(extrinsic, signature); let uxt: Vec<u8> = Decode::decode(&mut UncheckedExtrinsic::new(extrinsic, signature).encode().as_slice()).expect("Encoded extrinsic is valid");
self.transaction_pool.submit_one(&BlockId::hash(self.parent_hash), uxt)
self.transaction_pool.import_unchecked_extrinsic(BlockId::hash(self.parent_hash), uxt)
.expect("locally signed extrinsic is valid; qed"); .expect("locally signed extrinsic is valid; qed");
} }
} }
...@@ -720,7 +722,7 @@ impl ProposalTiming { ...@@ -720,7 +722,7 @@ impl ProposalTiming {
} }
/// Future which resolves upon the creation of a proposal. /// Future which resolves upon the creation of a proposal.
pub struct CreateProposal<C: PolkadotApi> { pub struct CreateProposal<C: PolkadotApi + Send + Sync> {
parent_hash: Hash, parent_hash: Hash,
parent_number: BlockNumber, parent_number: BlockNumber,
parent_id: BlockId, parent_id: BlockId,
...@@ -732,7 +734,7 @@ pub struct CreateProposal<C: PolkadotApi> { ...@@ -732,7 +734,7 @@ pub struct CreateProposal<C: PolkadotApi> {
offline: SharedOfflineTracker, offline: SharedOfflineTracker,
} }
impl<C> CreateProposal<C> where C: PolkadotApi { impl<C> CreateProposal<C> where C: PolkadotApi + Send + Sync {
fn propose_with(&self, candidates: Vec<CandidateReceipt>) -> Result<Block, Error> { fn propose_with(&self, candidates: Vec<CandidateReceipt>) -> Result<Block, Error> {
use polkadot_api::BlockBuilder; use polkadot_api::BlockBuilder;
use runtime_primitives::traits::{Hash as HashT, BlakeTwo256}; use runtime_primitives::traits::{Hash as HashT, BlakeTwo256};
...@@ -767,18 +769,18 @@ impl<C> CreateProposal<C> where C: PolkadotApi { ...@@ -767,18 +769,18 @@ impl<C> CreateProposal<C> where C: PolkadotApi {
{ {
let mut unqueue_invalid = Vec::new(); let mut unqueue_invalid = Vec::new();
let result = self.transaction_pool.cull_and_get_pending(BlockId::hash(self.parent_hash), |pending_iterator| { let result = self.transaction_pool.cull_and_get_pending(&BlockId::hash(self.parent_hash), |pending_iterator| {
let mut pending_size = 0; let mut pending_size = 0;
for pending in pending_iterator { for pending in pending_iterator {
if pending_size + pending.encoded_size() >= MAX_TRANSACTIONS_SIZE { break } if pending_size + pending.verified.encoded_size() >= MAX_TRANSACTIONS_SIZE { break }
match block_builder.push_extrinsic(pending.primitive_extrinsic()) { match block_builder.push_extrinsic(pending.original.clone()) {
Ok(()) => { Ok(()) => {
pending_size += pending.encoded_size(); pending_size += pending.verified.encoded_size();
} }
Err(e) => { Err(e) => {
trace!(target: "transaction-pool", "Invalid transaction: {}", e); trace!(target: "transaction-pool", "Invalid transaction: {}", e);
unqueue_invalid.push(pending.hash().clone()); unqueue_invalid.push(pending.verified.hash().clone());
} }
} }
} }
...@@ -819,7 +821,7 @@ impl<C> CreateProposal<C> where C: PolkadotApi { ...@@ -819,7 +821,7 @@ impl<C> CreateProposal<C> where C: PolkadotApi {
} }
} }
impl<C> Future for CreateProposal<C> where C: PolkadotApi { impl<C> Future for CreateProposal<C> where C: PolkadotApi + Send + Sync {
type Item = Block; type Item = Block;
type Error = Error; type Error = Error;
......
...@@ -227,7 +227,6 @@ impl Service { ...@@ -227,7 +227,6 @@ impl Service {
let last_agreement = s.last_agreement(); let last_agreement = s.last_agreement();
let can_build_upon = last_agreement let can_build_upon = last_agreement
.map_or(true, |x| !x.live || x.parent_hash != hash); .map_or(true, |x| !x.live || x.parent_hash != hash);
if hash == prev_best && can_build_upon { if hash == prev_best && can_build_upon {
debug!("Starting consensus round after a timeout"); debug!("Starting consensus round after a timeout");
start_bft(best_block, s.clone()); start_bft(best_block, s.clone());
......
...@@ -73,7 +73,7 @@ pub const DOT_PROTOCOL_ID: ::substrate_network::ProtocolId = *b"dot"; ...@@ -73,7 +73,7 @@ pub const DOT_PROTOCOL_ID: ::substrate_network::ProtocolId = *b"dot";
type FullStatus = GenericFullStatus<Block>; type FullStatus = GenericFullStatus<Block>;
/// Specialization of the network service for the polkadot protocol. /// Specialization of the network service for the polkadot protocol.
pub type NetworkService = ::substrate_network::Service<Block, PolkadotProtocol>; pub type NetworkService = ::substrate_network::Service<Block, PolkadotProtocol, Hash>;
/// Status of a Polkadot node. /// Status of a Polkadot node.
#[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)]
......
...@@ -24,6 +24,5 @@ substrate-runtime-io = { git = "https://github.com/paritytech/substrate" } ...@@ -24,6 +24,5 @@ substrate-runtime-io = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" } substrate-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-network = { git = "https://github.com/paritytech/substrate" } substrate-network = { git = "https://github.com/paritytech/substrate" }
substrate-client = { git = "https://github.com/paritytech/substrate" } substrate-client = { git = "https://github.com/paritytech/substrate" }
substrate-codec = { git = "https://github.com/paritytech/substrate" }
substrate-service = { git = "https://github.com/paritytech/substrate" } substrate-service = { git = "https://github.com/paritytech/substrate" }
substrate-telemetry = { git = "https://github.com/paritytech/substrate" } substrate-telemetry = { git = "https://github.com/paritytech/substrate" }
...@@ -29,7 +29,6 @@ extern crate polkadot_transaction_pool as transaction_pool; ...@@ -29,7 +29,6 @@ extern crate polkadot_transaction_pool as transaction_pool;
extern crate polkadot_network; extern crate polkadot_network;
extern crate substrate_primitives as primitives; extern crate substrate_primitives as primitives;
extern crate substrate_network as network; extern crate substrate_network as network;
extern crate substrate_codec as codec;
extern crate substrate_client as client; extern crate substrate_client as client;
extern crate substrate_service as service; extern crate substrate_service as service;
extern crate tokio; extern crate tokio;
...@@ -42,14 +41,12 @@ extern crate hex_literal; ...@@ -42,14 +41,12 @@ extern crate hex_literal;
pub mod chain_spec; pub mod chain_spec;
use std::sync::Arc; use std::sync::Arc;
use std::collections::HashMap; use tokio::prelude::{Stream, Future};
use codec::{Encode, Decode};
use transaction_pool::TransactionPool; use transaction_pool::TransactionPool;
use polkadot_api::{PolkadotApi, light::RemotePolkadotApiWrapper}; use polkadot_api::{PolkadotApi, light::RemotePolkadotApiWrapper};
use polkadot_primitives::{parachain, AccountId, Block, BlockId, Hash}; use polkadot_primitives::{parachain, AccountId, Block, BlockId, Hash};
use polkadot_runtime::GenesisConfig; use polkadot_runtime::GenesisConfig;
use client::Client; use client::{Client, BlockchainEvents};
use polkadot_network::{PolkadotProtocol, consensus::ConsensusNetwork}; use polkadot_network::{PolkadotProtocol, consensus::ConsensusNetwork};
use tokio::runtime::TaskExecutor; use tokio::runtime::TaskExecutor;
use service::FactoryFullConfiguration; use service::FactoryFullConfiguration;
...@@ -63,7 +60,7 @@ pub use client::ExecutionStrategy; ...@@ -63,7 +60,7 @@ pub use client::ExecutionStrategy;
pub type ChainSpec = service::ChainSpec<GenesisConfig>; pub type ChainSpec = service::ChainSpec<GenesisConfig>;
/// Polkadot client type for specialised `Components`. /// Polkadot client type for specialised `Components`.
pub type ComponentClient<C> = Client<<C as Components>::Backend, <C as Components>::Executor, Block>; pub type ComponentClient<C> = Client<<C as Components>::Backend, <C as Components>::Executor, Block>;
pub type NetworkService = network::Service<Block, <Factory as service::ServiceFactory>::NetworkProtocol>; pub type NetworkService = network::Service<Block, <Factory as service::ServiceFactory>::NetworkProtocol, Hash>;
/// A collection of type to generalise Polkadot specific components over full / light client. /// A collection of type to generalise Polkadot specific components over full / light client.
pub trait Components: service::Components { pub trait Components: service::Components {
...@@ -106,16 +103,11 @@ pub struct Factory; ...@@ -106,16 +103,11 @@ pub struct Factory;
impl service::ServiceFactory for Factory { impl service::ServiceFactory for Factory {
type Block = Block; type Block = Block;
type ExtrinsicHash = Hash;
type NetworkProtocol = PolkadotProtocol; type NetworkProtocol = PolkadotProtocol;
type RuntimeDispatch = polkadot_executor::Executor; type RuntimeDispatch = polkadot_executor::Executor;
type FullExtrinsicPool = TransactionPoolAdapter< type FullExtrinsicPoolApi = transaction_pool::ChainApi<service::FullClient<Self>>;
service::FullBackend<Self>, type LightExtrinsicPoolApi = transaction_pool::ChainApi<
service::FullExecutor<Self>,
service::FullClient<Self>
>;
type LightExtrinsicPool = TransactionPoolAdapter<
service::LightBackend<Self>,
service::LightExecutor<Self>,
RemotePolkadotApiWrapper<service::LightBackend<Self>, service::LightExecutor<Self>> RemotePolkadotApiWrapper<service::LightBackend<Self>, service::LightExecutor<Self>>
>; >;
type Genesis = GenesisConfig; type Genesis = GenesisConfig;
...@@ -124,25 +116,17 @@ impl service::ServiceFactory for Factory { ...@@ -124,25 +116,17 @@ impl service::ServiceFactory for Factory {
const NETWORK_PROTOCOL_ID: network::ProtocolId = ::polkadot_network::DOT_PROTOCOL_ID; const NETWORK_PROTOCOL_ID: network::ProtocolId = ::polkadot_network::DOT_PROTOCOL_ID;
fn build_full_extrinsic_pool(config: ExtrinsicPoolOptions, client: Arc<service::FullClient<Self>>) fn build_full_extrinsic_pool(config: ExtrinsicPoolOptions, client: Arc<service::FullClient<Self>>)
-> Result<Self::FullExtrinsicPool, Error> -> Result<TransactionPool<service::FullClient<Self>>, Error>
{ {
let api = client.clone(); let api = client.clone();
Ok(TransactionPoolAdapter { Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(api)))
pool: Arc::new(TransactionPool::new(config, api)),
client: client,
imports_external_transactions: true,
})
} }
fn build_light_extrinsic_pool(config: ExtrinsicPoolOptions, client: Arc<service::LightClient<Self>>) fn build_light_extrinsic_pool(config: ExtrinsicPoolOptions, client: Arc<service::LightClient<Self>>)
-> Result<Self::LightExtrinsicPool, Error> -> Result<TransactionPool<RemotePolkadotApiWrapper<service::LightBackend<Self>, service::LightExecutor<Self>>>, Error>
{ {
let api = Arc::new(RemotePolkadotApiWrapper(client.clone())); let api = Arc::new(RemotePolkadotApiWrapper(client.clone()));
Ok(TransactionPoolAdapter { Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(api)))
pool: Arc::new(TransactionPool::new(config, api)),
client: client,
imports_external_transactions: false,
})
} }
fn build_network_protocol(config: &Configuration) fn build_network_protocol(config: &Configuration)
...@@ -182,8 +166,18 @@ impl <C: Components> Service<C> { ...@@ -182,8 +166,18 @@ impl <C: Components> Service<C> {
pub fn new_light(config: Configuration, executor: TaskExecutor) pub fn new_light(config: Configuration, executor: TaskExecutor)
-> Result<Service<LightComponents<Factory>>, Error> -> Result<Service<LightComponents<Factory>>, Error>
{ {
let service = service::Service::<LightComponents<Factory>>::new(config, executor)?; let service = service::Service::<LightComponents<Factory>>::new(config, executor.clone())?;
let api = Arc::new(RemotePolkadotApiWrapper(service.client())); let api = Arc::new(RemotePolkadotApiWrapper(service.client()));
let pool = service.extrinsic_pool();
let events = service.client().import_notification_stream()
.for_each(move |notification| {
// re-verify all transactions without the sender.
pool.retry_verification(&BlockId::hash(notification.hash), None)
.map_err(|e| warn!("Error re-verifying transactions: {:?}", e))?;
Ok(())
})
.then(|_| Ok(()));
executor.spawn(events);
Ok(Service { Ok(Service {
client: service.client(), client: service.client(),
network: service.network(), network: service.network(),
...@@ -212,7 +206,16 @@ pub fn new_full(config: Configuration, executor: TaskExecutor) ...@@ -212,7 +206,16 @@ pub fn new_full(config: Configuration, executor: TaskExecutor)
let is_validator = (config.roles & Roles::AUTHORITY) == Roles::AUTHORITY; let is_validator = (config.roles & Roles::AUTHORITY) == Roles::AUTHORITY;
let service = service::Service::<FullComponents<Factory>>::new(config, executor.clone())?; let service = service::Service::<FullComponents<Factory>>::new(config, executor.clone())?;
let pool = service.extrinsic_pool();
let events = service.client().import_notification_stream()
.for_each(move |notification| {
// re-verify all transactions without the sender.
pool.retry_verification(&BlockId::hash(notification.hash), None)
.map_err(|e| warn!("Error re-verifying transactions: {:?}", e))?;
Ok(())
})
.then(|_| Ok(()));
executor.spawn(events);
// Spin consensus service if configured // Spin consensus service if configured
let consensus = if is_validator { let consensus = if is_validator {
// Load the first available key // Load the first available key
...@@ -261,103 +264,3 @@ impl<C: Components> ::std::ops::Deref for Service<C> { ...@@ -261,103 +264,3 @@ impl<C: Components> ::std::ops::Deref for Service<C> {
&self.inner &self.inner
} }
} }
/// Transaction pool adapter.
pub struct TransactionPoolAdapter<B, E, A> where A: Send + Sync, E: Send + Sync {
imports_external_transactions: bool,
pool: Arc<TransactionPool<A>>,
client: Arc<Client<B, E, Block>>,
}
impl<B, E, A> TransactionPoolAdapter<B, E, A>
where
A: Send + Sync,
B: client::backend::Backend<Block, KeccakHasher, RlpCodec> + Send + Sync,
E: client::CallExecutor<Block, KeccakHasher, RlpCodec> + Send + Sync,
{
fn best_block_id(&self) -> Option<BlockId> {
self.client.info()
.map(|info| BlockId::hash(info.chain.best_hash))
.map_err(|e| {
debug!("Error getting best block: {:?}", e);
})
.ok()
}
}
impl<B, E, A> network::TransactionPool<Block> for TransactionPoolAdapter<B, E, A>
where
B: client::backend::Backend<Block, KeccakHasher, RlpCodec> + Send + Sync,
E: client::CallExecutor<Block, KeccakHasher, RlpCodec> + Send + Sync,
A: polkadot_api::PolkadotApi + Send + Sync,
{
fn transactions(&self) -> Vec<(Hash, Vec<u8>)> {
let best_block_id = match self.best_block_id() {
Some(id) => id,
None => return vec![],
};
self.pool.cull_and_get_pending(best_block_id, |pending| pending
.map(|t| {
let hash = t.hash().clone();
(hash, t.primitive_extrinsic())
})
.collect()
).unwrap_or_else(|e| {
warn!("Error retrieving pending set: {}", e);
vec![]
})
}
fn import(&self, transaction: &Vec<u8>) -> Option<Hash> {
if !self.imports_external_transactions {
return None;
}
let encoded = transaction.encode();
if let Some(uxt) = Decode::decode(&mut &encoded[..]) {
let best_block_id = self.best_block_id()?;
match self.pool.import_unchecked_extrinsic(best_block_id, uxt) {
Ok(xt) => Some(*xt.hash()),
Err(e) => match *e.kind() {
transaction_pool::ErrorKind::AlreadyImported(hash) => Some(hash[..].into()),
_ => {
debug!(target: "txpool", "Error adding transaction to the pool: {:?}", e);
None
},
}
}
} else {
debug!(target: "txpool", "Error decoding transaction");
None
}
}
fn on_broadcasted(&self, propagations: HashMap<Hash, Vec<String>>) {
self.pool.on_broadcasted(propagations)
}
}
impl<B, E, A> service::ExtrinsicPool<Block> for TransactionPoolAdapter<B, E, A>
where
B: client::backend::Backend<Block, KeccakHasher, RlpCodec> + Send + Sync + 'static,
E: client::CallExecutor<Block, KeccakHasher, RlpCodec> + Send + Sync + 'static,
A: polkadot_api::PolkadotApi + Send + Sync + 'static,
{
type Api = TransactionPool<A>;
fn prune_imported(&self, hash: &Hash) {
let block = BlockId::hash(*hash);
if let Err(e) = self.pool.cull(block) {
warn!("Culling error: {:?}", e);
}
if let Err(e) = self.pool.retry_verification(block) {
warn!("Re-verifying error: {:?}", e);
}
}
fn api(&self) -> Arc<Self::Api> {
self.pool.clone()
}
}
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>. // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use extrinsic_pool::{self, txpool}; use extrinsic_pool;
use polkadot_api; use polkadot_api;
use primitives::Hash; use primitives::Hash;
use runtime::{Address, UncheckedExtrinsic}; use runtime::{Address, UncheckedExtrinsic};
error_chain! { error_chain! {
links { links {
Pool(txpool::Error, txpool::ErrorKind); Pool(extrinsic_pool::Error, extrinsic_pool::ErrorKind);
Api(polkadot_api::Error, polkadot_api::ErrorKind); Api(polkadot_api::Error, polkadot_api::ErrorKind);
} }
errors { errors {
...@@ -33,7 +33,7 @@ error_chain! { ...@@ -33,7 +33,7 @@ error_chain! {
/// Attempted to queue an inherent transaction. /// Attempted to queue an inherent transaction.
IsInherent(xt: UncheckedExtrinsic) { IsInherent(xt: UncheckedExtrinsic) {
description("Inherent transactions cannot be queued."), description("Inherent transactions cannot be queued."),
display("Inehrent transactions cannot be queued."), display("Inherent transactions cannot be queued."),
} }
/// Attempted to queue a transaction with bad signature. /// Attempted to queue a transaction with bad signature.
BadSignature(e: &'static str) { BadSignature(e: &'static str) {
...@@ -63,10 +63,10 @@ error_chain! { ...@@ -63,10 +63,10 @@ error_chain! {
} }
} }
impl extrinsic_pool::api::Error for Error { impl extrinsic_pool::IntoPoolError for Error {
fn into_pool_error(self) -> ::std::result::Result<txpool::Error, Self> { fn into_pool_error(self) -> ::std::result::Result<extrinsic_pool::Error, Self> {
match self { match self {
Error(ErrorKind::Pool(e), c) => Ok(txpool::Error(e, c)), Error(ErrorKind::Pool(e), c) => Ok(extrinsic_pool::Error(e, c)),
e => Err(e), e => Err(e),
} }
} }
......
This diff is collapsed.
Supports Markdown
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