Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Remove duplicated reducers #64

Merged
merged 1 commit into from
Aug 9, 2022
Merged

chore: Remove duplicated reducers #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/scrolls/daemon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub fn run(args: &Args) -> Result<(), scrolls::Error> {

let enrich = config.enrich.unwrap_or_default().bootstrapper(&policy);

let reducer = reducers::Bootstrapper::new(config.reducers, &chain, &policy);
let reducer = reducers::Bootstrapper::new(config.reducers, &policy);

let storage = config.storage.plugin(&chain, &config.intersect);

Expand Down
4 changes: 2 additions & 2 deletions src/reducers/balance_by_address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl Reducer {
None => format!("{}.{}", "balance_by_address".to_string(), address),
};

let crdt = model::CRDTCommand::PNCounter(key, utxo.ada_amount() as i64);
let crdt = model::CRDTCommand::PNCounter(key, -1 * utxo.ada_amount() as i64);

output.send(gasket::messaging::Message::from(crdt))?;

Expand All @@ -55,7 +55,7 @@ impl Reducer {
None => format!("{}.{}", "balance_by_address".to_string(), address),
};

let crdt = model::CRDTCommand::PNCounter(key, (-1) * tx_output.ada_amount() as i64);
let crdt = model::CRDTCommand::PNCounter(key, tx_output.ada_amount() as i64);

output.send(gasket::messaging::Message::from(crdt))?;

Expand Down
97 changes: 17 additions & 80 deletions src/reducers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,9 @@ pub mod address_by_txo;
#[cfg(feature = "unstable")]
pub mod balance_by_address;
#[cfg(feature = "unstable")]
pub mod total_transactions_count;
#[cfg(feature = "unstable")]
pub mod total_transactions_count_by_addresses;
#[cfg(feature = "unstable")]
pub mod transactions_count_by_address;
#[cfg(feature = "unstable")]
pub mod transactions_count_by_address_by_epoch;
#[cfg(feature = "unstable")]
pub mod transactions_count_by_epoch;
#[cfg(feature = "unstable")]
pub mod transactions_count_by_script_hash;
#[cfg(feature = "unstable")]
pub mod tx_by_hash;
#[cfg(feature = "unstable")]
pub mod tx_count_by_address;

#[derive(Deserialize)]
#[serde(tag = "type")]
Expand All @@ -44,29 +34,15 @@ pub enum Config {
#[cfg(feature = "unstable")]
AddressByTxo(address_by_txo::Config),
#[cfg(feature = "unstable")]
TotalTransactionsCount(total_transactions_count::Config),
#[cfg(feature = "unstable")]
TransactionsCountByEpoch(transactions_count_by_epoch::Config),
#[cfg(feature = "unstable")]
TransactionsCountByAddress(transactions_count_by_address::Config),
#[cfg(feature = "unstable")]
TransactionsCountByAddressByEpoch(transactions_count_by_address_by_epoch::Config),
#[cfg(feature = "unstable")]
TotalTransactionsCountByAddresses(total_transactions_count_by_addresses::Config),
#[cfg(feature = "unstable")]
BalanceByAddress(balance_by_address::Config),
#[cfg(feature = "unstable")]
TxByHash(tx_by_hash::Config),
#[cfg(feature = "unstable")]
TransactionsCountByScriptHash(transactions_count_by_script_hash::Config),
TxCountByAddress(tx_count_by_address::Config),
}

impl Config {
fn plugin(
self,
chain: &crosscut::ChainWellKnownInfo,
policy: &crosscut::policies::RuntimePolicy,
) -> Reducer {
fn plugin(self, policy: &crosscut::policies::RuntimePolicy) -> Reducer {
match self {
Config::UtxoByAddress(c) => c.plugin(policy),
Config::PointByTx(c) => c.plugin(),
Expand All @@ -75,21 +51,11 @@ impl Config {
#[cfg(feature = "unstable")]
Config::AddressByTxo(c) => c.plugin(policy),
#[cfg(feature = "unstable")]
Config::TotalTransactionsCount(c) => c.plugin(),
#[cfg(feature = "unstable")]
Config::TransactionsCountByEpoch(c) => c.plugin(chain),
#[cfg(feature = "unstable")]
Config::TransactionsCountByAddress(c) => c.plugin(policy),
#[cfg(feature = "unstable")]
Config::TransactionsCountByAddressByEpoch(c) => c.plugin(chain, policy),
#[cfg(feature = "unstable")]
Config::TotalTransactionsCountByAddresses(c) => c.plugin(),
#[cfg(feature = "unstable")]
Config::BalanceByAddress(c) => c.plugin(policy),
#[cfg(feature = "unstable")]
Config::TxByHash(c) => c.plugin(),
#[cfg(feature = "unstable")]
Config::TransactionsCountByScriptHash(c) => c.plugin(chain),
Config::TxCountByAddress(c) => c.plugin(policy),
}
}
}
Expand All @@ -102,16 +68,9 @@ pub struct Bootstrapper {
}

impl Bootstrapper {
pub fn new(
configs: Vec<Config>,
chain: &crosscut::ChainWellKnownInfo,
policy: &crosscut::policies::RuntimePolicy,
) -> Self {
pub fn new(configs: Vec<Config>, policy: &crosscut::policies::RuntimePolicy) -> Self {
Self {
reducers: configs
.into_iter()
.map(|x| x.plugin(chain, policy))
.collect(),
reducers: configs.into_iter().map(|x| x.plugin(policy)).collect(),
input: Default::default(),
output: Default::default(),
policy: policy.clone(),
Expand All @@ -128,16 +87,14 @@ impl Bootstrapper {

pub fn spawn_stages(self, pipeline: &mut bootstrap::Pipeline) {
let worker = worker::Worker::new(self.reducers, self.input, self.output, self.policy);
pipeline.register_stage(
spawn_stage(
worker,
gasket::runtime::Policy {
tick_timeout: Some(Duration::from_secs(600)),
..Default::default()
},
Some("reducers"),
),
);
pipeline.register_stage(spawn_stage(
worker,
gasket::runtime::Policy {
tick_timeout: Some(Duration::from_secs(600)),
..Default::default()
},
Some("reducers"),
));
}
}

Expand All @@ -149,21 +106,11 @@ pub enum Reducer {
#[cfg(feature = "unstable")]
AddressByTxo(address_by_txo::Reducer),
#[cfg(feature = "unstable")]
TotalTransactionsCount(total_transactions_count::Reducer),
#[cfg(feature = "unstable")]
TransactionsCountByEpoch(transactions_count_by_epoch::Reducer),
#[cfg(feature = "unstable")]
TransactionsCountByAddress(transactions_count_by_address::Reducer),
#[cfg(feature = "unstable")]
TransactionsCountByAddressByEpoch(transactions_count_by_address_by_epoch::Reducer),
#[cfg(feature = "unstable")]
TotalTransactionsCountByAddresses(total_transactions_count_by_addresses::Reducer),
#[cfg(feature = "unstable")]
BalanceByAddress(balance_by_address::Reducer),
#[cfg(feature = "unstable")]
TxByHash(tx_by_hash::Reducer),
#[cfg(feature = "unstable")]
TransactionsCountByScriptHash(transactions_count_by_script_hash::Reducer),
TxCountByAddress(tx_count_by_address::Reducer),
}

impl Reducer {
Expand All @@ -181,21 +128,11 @@ impl Reducer {
#[cfg(feature = "unstable")]
Reducer::AddressByTxo(x) => x.reduce_block(block, ctx, output),
#[cfg(feature = "unstable")]
Reducer::TotalTransactionsCount(x) => x.reduce_block(block, output),
#[cfg(feature = "unstable")]
Reducer::TransactionsCountByEpoch(x) => x.reduce_block(block, output),
#[cfg(feature = "unstable")]
Reducer::TransactionsCountByAddress(x) => x.reduce_block(block, ctx, output),
#[cfg(feature = "unstable")]
Reducer::TransactionsCountByAddressByEpoch(x) => x.reduce_block(block, ctx, output),
#[cfg(feature = "unstable")]
Reducer::TotalTransactionsCountByAddresses(x) => x.reduce_block(block, output),
#[cfg(feature = "unstable")]
Reducer::BalanceByAddress(x) => x.reduce_block(block, ctx, output),
#[cfg(feature = "unstable")]
Reducer::TxByHash(x) => x.reduce_block(block, output),
#[cfg(feature = "unstable")]
Reducer::TransactionsCountByScriptHash(x) => x.reduce_block(block, output),
Reducer::TxCountByAddress(x) => x.reduce_block(block, ctx, output),
}
}
}
51 changes: 0 additions & 51 deletions src/reducers/total_transactions_count.rs
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions src/reducers/total_transactions_count_by_addresses.rs
View file
Open in desktop

This file was deleted.

Loading