Skip to content

Commit 406d7c4

Browse files
sfauvelsfauvel
committed
Remove dirpath from BlockScanner and CardanoTransactionsImporter
1 parent abbc338 commit 406d7c4

File tree

9 files changed

+14
-46
lines changed

9 files changed

+14
-46
lines changed

‎mithril-aggregator/src/dependency_injection/builder.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,6 @@ impl DependenciesBuilder {
12171217
let transactions_importer = Arc::new(CardanoTransactionsImporter::new(
12181218
self.get_block_scanner().await?,
12191219
self.get_transaction_repository().await?,
1220-
&self.configuration.db_directory,
12211220
self.get_logger()?,
12221221
));
12231222

‎mithril-aggregator/src/services/cardano_transactions_importer.rs‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::mem;
22
use std::ops::Range;
3-
use std::path::{Path, PathBuf};
43
use std::sync::Arc;
54

65
use anyhow::Context;
@@ -57,7 +56,6 @@ pub struct CardanoTransactionsImporter {
5756
block_scanner: Arc<dyn BlockScanner>,
5857
transaction_store: Arc<dyn TransactionStore>,
5958
logger: Logger,
60-
dirpath: PathBuf,
6159
}
6260

6361
impl CardanoTransactionsImporter {
@@ -69,14 +67,12 @@ impl CardanoTransactionsImporter {
6967
pub fn new(
7068
block_scanner: Arc<dyn BlockScanner>,
7169
transaction_store: Arc<dyn TransactionStore>,
72-
dirpath: &Path,
7370
logger: Logger,
7471
) -> Self {
7572
Self {
7673
block_scanner,
7774
transaction_store,
7875
logger,
79-
dirpath: dirpath.to_owned(),
8076
}
8177
}
8278

@@ -104,7 +100,7 @@ impl CardanoTransactionsImporter {
104100
from.as_ref().map(|c|c.block_number).unwrap_or(0)
105101
);
106102

107-
let mut streamer = self.block_scanner.scan(&self.dirpath, from, until).await?;
103+
let mut streamer = self.block_scanner.scan(from, until).await?;
108104

109105
while let Some(blocks) = streamer.poll_next().await? {
110106
match blocks {
@@ -221,7 +217,6 @@ mod tests {
221217
impl BlockScanner for BlockScannerImpl {
222218
async fn scan(
223219
&self,
224-
dirpath: &Path,
225220
from: Option<ChainPoint>,
226221
until: BlockNumber,
227222
) -> StdResult<Box<dyn BlockStreamer>>;
@@ -233,12 +228,7 @@ mod tests {
233228
scanner: Arc<dyn BlockScanner>,
234229
transaction_store: Arc<dyn TransactionStore>,
235230
) -> Self {
236-
CardanoTransactionsImporter::new(
237-
scanner,
238-
transaction_store,
239-
Path::new(""),
240-
TestLogger::stdout(),
241-
)
231+
CardanoTransactionsImporter::new(scanner, transaction_store, TestLogger::stdout())
242232
}
243233
}
244234

@@ -292,8 +282,8 @@ mod tests {
292282
let mut scanner_mock = MockBlockScannerImpl::new();
293283
scanner_mock
294284
.expect_scan()
295-
.withf(move |_, from, until| from.is_none() && until == &up_to_block_number)
296-
.return_once(move |_, _, _| {
285+
.withf(move |from, until| from.is_none() && until == &up_to_block_number)
286+
.return_once(move |_, _| {
297287
Ok(Box::new(DumbBlockStreamer::new().forwards(vec![blocks])))
298288
});
299289
CardanoTransactionsImporter::new_for_test(Arc::new(scanner_mock), repository.clone())
@@ -474,11 +464,11 @@ mod tests {
474464
let mut scanner_mock = MockBlockScannerImpl::new();
475465
scanner_mock
476466
.expect_scan()
477-
.withf(move |_, from, until| {
467+
.withf(move |from, until| {
478468
from == &Some(highest_stored_chain_point.clone())
479469
&& *until == up_to_block_number
480470
})
481-
.return_once(move |_, _, _| {
471+
.return_once(move |_, _| {
482472
Ok(Box::new(
483473
DumbBlockStreamer::new().forwards(vec![scanned_blocks]),
484474
))

‎mithril-common/src/cardano_block_scanner/block_scanner.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::path::Path;
21
use std::sync::Arc;
32

43
use async_trait::async_trait;
@@ -40,7 +39,6 @@ impl CardanoBlockScanner {
4039
impl BlockScanner for CardanoBlockScanner {
4140
async fn scan(
4241
&self,
43-
_dirpath: &Path,
4442
from: Option<ChainPoint>,
4543
until: BlockNumber,
4644
) -> StdResult<Box<dyn BlockStreamer>> {

‎mithril-common/src/cardano_block_scanner/dumb_block_scanner.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use std::collections::VecDeque;
2-
use std::path::Path;
32
use std::sync::RwLock;
43

54
use async_trait::async_trait;
@@ -61,7 +60,6 @@ impl Default for DumbBlockScanner {
6160
impl BlockScanner for DumbBlockScanner {
6261
async fn scan(
6362
&self,
64-
_dirpath: &Path,
6563
_from: Option<ChainPoint>,
6664
_until: BlockNumber,
6765
) -> StdResult<Box<dyn BlockStreamer>> {
@@ -185,7 +183,7 @@ mod tests {
185183
let expected_blocks = vec![ScannedBlock::new("hash-1", 1, 10, 20, Vec::<&str>::new())];
186184

187185
let scanner = DumbBlockScanner::new().forwards(vec![expected_blocks.clone()]);
188-
let mut streamer = scanner.scan(Path::new("dummy"), None, 5).await.unwrap();
186+
let mut streamer = scanner.scan(None, 5).await.unwrap();
189187

190188
let blocks = streamer.poll_all().await.unwrap();
191189
assert_eq!(blocks, expected_blocks);
@@ -199,7 +197,7 @@ mod tests {
199197
let scanner = DumbBlockScanner::new()
200198
.forwards(vec![expected_blocks.clone()])
201199
.backward(expected_chain_point.clone());
202-
let mut streamer = scanner.scan(Path::new("dummy"), None, 5).await.unwrap();
200+
let mut streamer = scanner.scan(None, 5).await.unwrap();
203201

204202
let blocks = streamer.poll_next().await.unwrap();
205203
assert_eq!(

‎mithril-common/src/cardano_block_scanner/interface.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std::path::Path;
2-
31
use async_trait::async_trait;
42

53
use crate::cardano_block_scanner::ScannedBlock;
@@ -28,7 +26,6 @@ use crate::StdResult;
2826
/// impl BlockScanner for BlockScannerImpl {
2927
/// async fn scan(
3028
/// &self,
31-
/// dirpath: &Path,
3229
/// from: Option<ChainPoint>,
3330
/// until: BlockNumber,
3431
/// ) -> StdResult<Box<dyn BlockStreamer>>;
@@ -49,7 +46,6 @@ pub trait BlockScanner: Sync + Send {
4946
/// Scan the transactions
5047
async fn scan(
5148
&self,
52-
dirpath: &Path,
5349
from: Option<ChainPoint>,
5450
until: BlockNumber,
5551
) -> StdResult<Box<dyn BlockStreamer>>;

‎mithril-signer/src/cardano_transactions_importer.rs‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::mem;
22
use std::ops::Range;
3-
use std::path::{Path, PathBuf};
43
use std::sync::Arc;
54

65
use anyhow::Context;
@@ -57,7 +56,6 @@ pub struct CardanoTransactionsImporter {
5756
block_scanner: Arc<dyn BlockScanner>,
5857
transaction_store: Arc<dyn TransactionStore>,
5958
logger: Logger,
60-
dirpath: PathBuf,
6159
}
6260

6361
impl CardanoTransactionsImporter {
@@ -69,14 +67,12 @@ impl CardanoTransactionsImporter {
6967
pub fn new(
7068
block_scanner: Arc<dyn BlockScanner>,
7169
transaction_store: Arc<dyn TransactionStore>,
72-
dirpath: &Path,
7370
logger: Logger,
7471
) -> Self {
7572
Self {
7673
block_scanner,
7774
transaction_store,
7875
logger,
79-
dirpath: dirpath.to_owned(),
8076
}
8177
}
8278

@@ -104,7 +100,7 @@ impl CardanoTransactionsImporter {
104100
from.as_ref().map(|c|c.block_number).unwrap_or(0)
105101
);
106102

107-
let mut streamer = self.block_scanner.scan(&self.dirpath, from, until).await?;
103+
let mut streamer = self.block_scanner.scan(from, until).await?;
108104

109105
while let Some(blocks) = streamer.poll_next().await? {
110106
match blocks {
@@ -221,7 +217,6 @@ mod tests {
221217
impl BlockScanner for BlockScannerImpl {
222218
async fn scan(
223219
&self,
224-
dirpath: &Path,
225220
from: Option<ChainPoint>,
226221
until: BlockNumber,
227222
) -> StdResult<Box<dyn BlockStreamer>>;
@@ -233,12 +228,7 @@ mod tests {
233228
scanner: Arc<dyn BlockScanner>,
234229
transaction_store: Arc<dyn TransactionStore>,
235230
) -> Self {
236-
CardanoTransactionsImporter::new(
237-
scanner,
238-
transaction_store,
239-
Path::new(""),
240-
TestLogger::stdout(),
241-
)
231+
CardanoTransactionsImporter::new(scanner, transaction_store, TestLogger::stdout())
242232
}
243233
}
244234

@@ -292,8 +282,8 @@ mod tests {
292282
let mut scanner_mock = MockBlockScannerImpl::new();
293283
scanner_mock
294284
.expect_scan()
295-
.withf(move |_, from, until| from.is_none() && until == &up_to_block_number)
296-
.return_once(move |_, _, _| {
285+
.withf(move |from, until| from.is_none() && until == &up_to_block_number)
286+
.return_once(move |_, _| {
297287
Ok(Box::new(DumbBlockStreamer::new().forwards(vec![blocks])))
298288
});
299289
CardanoTransactionsImporter::new_for_test(Arc::new(scanner_mock), repository.clone())
@@ -474,11 +464,11 @@ mod tests {
474464
let mut scanner_mock = MockBlockScannerImpl::new();
475465
scanner_mock
476466
.expect_scan()
477-
.withf(move |_, from, until| {
467+
.withf(move |from, until| {
478468
from == &Some(highest_stored_chain_point.clone())
479469
&& *until == up_to_block_number
480470
})
481-
.return_once(move |_, _, _| {
471+
.return_once(move |_, _| {
482472
Ok(Box::new(
483473
DumbBlockStreamer::new().forwards(vec![scanned_blocks]),
484474
))

‎mithril-signer/src/runtime/runner.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ mod tests {
562562
let transactions_importer = Arc::new(CardanoTransactionsImporter::new(
563563
transaction_parser.clone(),
564564
transaction_store.clone(),
565-
Path::new(""),
566565
slog_scope::logger(),
567566
));
568567
let block_range_root_retriever = Arc::new(MockBlockRangeRootRetrieverImpl::new());

‎mithril-signer/src/runtime/signer_services.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ impl<'a> ServiceBuilder for ProductionServiceBuilder<'a> {
283283
let transactions_importer = Arc::new(CardanoTransactionsImporter::new(
284284
block_scanner,
285285
transaction_store.clone(),
286-
&self.config.db_directory,
287286
slog_scope::logger(),
288287
));
289288
// Wrap the transaction importer with decorator to prune the transactions after import

‎mithril-signer/tests/test_extensions/state_machine_tester.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ impl StateMachineTester {
187187
let transactions_importer = Arc::new(CardanoTransactionsImporter::new(
188188
block_scanner.clone(),
189189
transaction_store.clone(),
190-
Path::new(""),
191190
slog_scope::logger(),
192191
));
193192
let block_range_root_retriever = transaction_store.clone();

0 commit comments

Comments
 (0)