From 9c05f597d00501d40d6229316126fa5ef9dee9c4 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Thu, 23 Mar 2023 22:26:15 -0300 Subject: [PATCH] Release v2.0.0-alpha.1 --- .github/e2e/gcp-pubsub-10-blocks.yaml | 62 +++++++++++++++++++ .../e2e/teak-perigee-375701-90625f60f360.json | 12 ++++ .github/workflows/release.yml | 6 ++ .github/workflows/validate.yml | 21 +------ Cargo.lock | 11 +++- Cargo.toml | 6 +- src/bin/oura/console.rs | 18 ++---- src/bin/oura/daemon.rs | 14 ++--- src/filters/deno/mod.rs | 10 ++- src/filters/dsl.rs | 24 ++++--- src/filters/json/mod.rs | 2 +- src/filters/legacy_v1/map.rs | 17 +---- src/filters/noop.rs | 2 +- src/filters/wasm/mod.rs | 2 +- src/framework/errors.rs | 9 +-- src/framework/mod.rs | 1 - src/lib.rs | 2 - src/sinks/noop.rs | 2 +- src/sinks/terminal/format.rs | 7 +-- src/sinks/terminal/run.rs | 2 +- src/sources/mod.rs | 2 +- src/sources/n2n/mod.rs | 2 +- 22 files changed, 142 insertions(+), 92 deletions(-) create mode 100644 .github/e2e/gcp-pubsub-10-blocks.yaml create mode 100644 .github/e2e/teak-perigee-375701-90625f60f360.json diff --git a/.github/e2e/gcp-pubsub-10-blocks.yaml b/.github/e2e/gcp-pubsub-10-blocks.yaml new file mode 100644 index 00000000..7c5b3209 --- /dev/null +++ b/.github/e2e/gcp-pubsub-10-blocks.yaml @@ -0,0 +1,62 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: ${TEST_NAME} +data: + daemon.toml: |- + [source] + type = "N2N" + address = ["Tcp", "relays-new.cardano-mainnet.iohk.io:3001"] + magic = "mainnet" + + [source.finalize] + max_block_quantity = 10 + + [source.intersect] + type = "Point" + value = [50030552, "5a091e9831bc0fcd6e6bdb2877036bb260abb4e19195517e4153fb041f956df5"] + + [sink] + type = "GcpPubSub" + topic = "oura-e2e" +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: ${TEST_NAME} + labels: + app: ${TEST_NAME} +spec: + backoffLimit: 1 + template: + metadata: + labels: + app: ${TEST_NAME} + spec: + restartPolicy: "Never" + serviceAccount: test + serviceAccountName: test + containers: + - name: main + image: ${TARGET_IMAGE} + env: + - name: "RUST_LOG" + value: "warn" + - name: "" + resources: + requests: + memory: 100Mi + cpu: 50m + limits: + memory: 500Mi + cpu: 200m + args: + - "daemon" + volumeMounts: + - mountPath: /etc/oura + name: oura-config + volumes: + - name: oura-config + configMap: + name: ${TEST_NAME} diff --git a/.github/e2e/teak-perigee-375701-90625f60f360.json b/.github/e2e/teak-perigee-375701-90625f60f360.json new file mode 100644 index 00000000..98e9cbcd --- /dev/null +++ b/.github/e2e/teak-perigee-375701-90625f60f360.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "teak-perigee-375701", + "private_key_id": "90625f60f360ff18381e6b667fd974bf3ab3045f", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8OcbP8PIt7sr/\njRzU9Dz5BjFijwnCk+hzYIWNueFpZNxunQrh9kOiqNAw2Js4ufxk89lm3ztAexwk\nEdBKwtbPn0696uK6Ad24doPAFwA3O8GkVNqHUv687ULxSvZpkRoT/139jfwt26S5\nWN2f8yb/UzGuyJtxqQHDCTBCDg7oo5LtLwpvTaZZMu3sZ0c/qG0JnOD3YTE4x5km\nMPsj7VF0x3O5QVhgwVyBAy9FCnPSO9zxm7GuT0CoDsbLIAEShsnxHtn5IAi9q7UY\nNHtD1ZWYFuLdWe7QUFkTMDayOQcgzVnbVo/bMVnHyH4gEu3u6ApOiUG9aIfxhCGy\npBWSAh67AgMBAAECggEAEPQ6Ha6YydCTNVu+QWPZS1ImlNEu5ZL4CM7XyMSTWRbU\nkIJ4IZLsIOGIYYkpL7D4J7AboKhlbsq7MqtUfsXR0bRXERE9DqV7YkTYKJW8/byi\nr3NUybdzXYx+qQhOoLY8SjMIaGQ0VxcZKiuNSH2ydHFHoNqavpNxpq7HS4CqEOpl\nqUelFy0te3l2QIJZLeOurtgmCZRNXlSa3PCpNJwOgzn34MOilutUf2zbF5SU675V\n7XL8KscVp5aHcnRKbHnIDgnwDFhNgK/LGuG4vR8T2Fj+mJh3zuFywopoAKs16p/7\nR54I2Rf9zGG/LtIvKzn54rAyV9XQt/WQuMLuyTNU5QKBgQDt0/FucTpeKveuZ5Ze\nOFgW960kzcI/K/4qE+N6VPSK/FJqg6/fygRzkQxda4E/P9wIet0ev9Js4qtATunz\nWTRTrnQm455JiFMb/M8C3m4/vy7TjZ6d1YH2Qqjy6e+V/aD2EFk4r0H4aItuJcS2\n7ziWIBjJV1TA4AgxCzksPCEcLwKBgQDKm5WaNG/yNAKmDYJLhJBXw7oakSziPt5G\nvzKLUmoiwZ9e5ZPBENh9mOF7fctK1vPY5YiezGYcNDE47aUKHOa7iLfIsLKqzf1V\nHgO7rIMLQ3h5eXKxlzhSPXsaT8GbuyCUrSKXCF9VLanoE779xE4ldo0DXNraCKfC\nSgLl3D4HNQKBgQCEvtvvbTvK++irbB4+EOz6RNxbwo09fWysR9WcnnawbQ4DbeVo\n3/WEG93u9uZ5S0ehZBKv6xmktRApIOLsdUoDu0gRvNLI8FKTOJTDYSvgYPHeGxoB\ntv6HWcW7cF/ONHb3YUCrpwcHhDLvFB2sjfHjuZ6cIyanUWTBGyaaTiWc+QKBgHjj\n3J/mKeWaovnxlYz5zCaR4rl3ZhCY8ofEDaSTyEB0x2MYGNFZ+9L1JZVJucMt/tGs\nI5ic3VB20+fj5FXkaMf9C6vzwqenwUDIZ/HTPV27JGdWz9inIjPv+0P30s3ZGdec\ndscnd7qbRIX1QkCooPg5hGo9PVhbUb3b6167y0cBAoGBANXIgiDKc3moOJfI73t+\nuqZ55pBfiX8QaaTqSWdX+pNQemIp97UfW6vPG9gpsEZswUkwSNQjH5111ePLE0te\nK7dqqCuEMK7IIHGaMo48wZ8Et3tbWoLxpJu5iCaqCotxQ6ovUJAHPmb0ab42CxIV\n8vW11v5CXVCWa3f9YnMWfdqF\n-----END PRIVATE KEY-----\n", + "client_email": "oura-e2e@teak-perigee-375701.iam.gserviceaccount.com", + "client_id": "105764970135434041671", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/oura-e2e%40teak-perigee-375701.iam.gserviceaccount.com" +} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b54ce9ba..3c9358dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,6 +131,11 @@ jobs: uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=raw,value=latest,enable={{is_default_branch}} + type=semver,pattern=v{{major}} + type=semver,pattern=v{{major}}.{{minor}} + type=semver,pattern=v{{version}} - name: Login to DockerHub uses: docker/login-action@v2 @@ -182,3 +187,4 @@ jobs: with: files: oura-*/oura-* body_path: RELEASE.md + draft: true diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a95d44ed..4888db93 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -55,7 +55,7 @@ jobs: command: test args: --all-features - lints-rust: + lints: name: Lint Rust runs-on: ubuntu-latest steps: @@ -80,21 +80,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: clippy - args: --all-features -- -D warnings - - lints-others: - name: Lint Support Files - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Check EditorConfig Compliance - uses: editorconfig-checker/action-editorconfig-checker@v1 - - lints: - name: Lint Rust & Support Files - runs-on: ubuntu-latest - needs: [lints-rust, lints-others] - steps: - - run: echo "All lints successful" + args: --all-features --all-targets -- -D warnings diff --git a/Cargo.lock b/Cargo.lock index d3826169..b4c3d728 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4012,7 +4012,7 @@ checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "oura" -version = "1.8.1" +version = "2.0.0-alpha.1" dependencies = [ "aws-config", "aws-sdk-lambda", @@ -4110,6 +4110,7 @@ dependencies = [ [[package]] name = "pallas" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "pallas-addresses", "pallas-codec", @@ -4124,6 +4125,7 @@ dependencies = [ [[package]] name = "pallas-addresses" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "base58", "bech32", @@ -4136,6 +4138,7 @@ dependencies = [ [[package]] name = "pallas-codec" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "hex", "minicbor", @@ -4145,6 +4148,7 @@ dependencies = [ [[package]] name = "pallas-crypto" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "cryptoxide", "hex", @@ -4157,6 +4161,7 @@ dependencies = [ [[package]] name = "pallas-miniprotocols" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "hex", "itertools", @@ -4169,6 +4174,7 @@ dependencies = [ [[package]] name = "pallas-multiplexer" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "byteorder 1.4.3", "hex", @@ -4182,6 +4188,7 @@ dependencies = [ [[package]] name = "pallas-primitives" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "base58", "bech32", @@ -4196,6 +4203,7 @@ dependencies = [ [[package]] name = "pallas-traverse" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "hex", "pallas-addresses", @@ -4209,6 +4217,7 @@ dependencies = [ [[package]] name = "pallas-upstream" version = "0.18.0" +source = "git+https://github.com/txpipe/pallas#381a46f2cff0ee67189aaf2d6456521728ac6ea1" dependencies = [ "gasket", "pallas-codec", diff --git a/Cargo.toml b/Cargo.toml index ba850f45..f07f802d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "oura" description = "The tail of Cardano" -version = "1.8.1" +version = "2.0.0-alpha.1" edition = "2021" repository = "https://github.com/txpipe/oura" homepage = "https://github.com/txpipe/oura" @@ -13,8 +13,8 @@ authors = ["Santiago Carmuega "] [dependencies] # pallas = "0.18.0" -# pallas = { git = "https://github.com/txpipe/pallas" } -pallas = { path = "../pallas/pallas" } +pallas = { git = "https://github.com/txpipe/pallas" } +# pallas = { path = "../pallas/pallas" } # gasket = { path = "../../construkts/gasket-rs" } gasket = { git = "https://github.com/construkts/gasket-rs.git" } hex = "0.4.3" diff --git a/src/bin/oura/console.rs b/src/bin/oura/console.rs index c44190cd..5c68501f 100644 --- a/src/bin/oura/console.rs +++ b/src/bin/oura/console.rs @@ -7,18 +7,13 @@ use gasket::{metrics::Reading, runtime::Tether}; use lazy_static::{__Deref, lazy_static}; use log::Log; -#[derive(clap::ValueEnum, Clone)] +#[derive(clap::ValueEnum, Clone, Default)] pub enum Mode { /// shows progress as a plain sequence of logs + #[default] Plain, /// shows aggregated progress and metrics - TUI, -} - -impl Default for Mode { - fn default() -> Self { - Mode::Plain - } + Tui, } struct TuiConsole { @@ -39,8 +34,7 @@ impl TuiConsole { indicatif::ProgressBar::new_spinner().with_style( indicatif::ProgressStyle::default_spinner() .template(&format!( - "{{spinner}} {:<20} {{msg:<20}} {{pos:>8}} | {{per_sec}}", - name + "{{spinner}} {name:<20} {{msg:<20}} {{pos:>8}} | {{per_sec}}" )) .unwrap(), ), @@ -195,7 +189,7 @@ lazy_static! { pub fn initialize(mode: &Option) { match mode { - Some(Mode::TUI) => log::set_logger(TUI_CONSOLE.deref()) + Some(Mode::Tui) => log::set_logger(TUI_CONSOLE.deref()) .map(|_| log::set_max_level(log::LevelFilter::Info)) .unwrap(), _ => tracing::subscriber::set_global_default( @@ -209,7 +203,7 @@ pub fn initialize(mode: &Option) { pub fn refresh<'a>(mode: &Option, tethers: impl Iterator) { match mode { - Some(Mode::TUI) => TUI_CONSOLE.refresh(tethers), + Some(Mode::Tui) => TUI_CONSOLE.refresh(tethers), _ => PLAIN_CONSOLE.refresh(tethers), } } diff --git a/src/bin/oura/daemon.rs b/src/bin/oura/daemon.rs index 57433a00..f5730a56 100644 --- a/src/bin/oura/daemon.rs +++ b/src/bin/oura/daemon.rs @@ -1,4 +1,3 @@ -use clap; use gasket::runtime::Tether; use oura::{filters, framework::*, sinks, sources}; use pallas::{ledger::traverse::wellknown::GenesisValues, network::upstream::cursor::Cursor}; @@ -56,10 +55,9 @@ impl Runtime { fn should_stop(&self) -> bool { self.all_tethers().any(|tether| match tether.check_state() { - gasket::runtime::TetherState::Alive(x) => match x { - gasket::runtime::StageState::StandBy => true, - _ => false, - }, + gasket::runtime::TetherState::Alive(x) => { + matches!(x, gasket::runtime::StageState::StandBy) + } _ => true, }) } @@ -134,11 +132,11 @@ fn bootstrap( pub fn run(args: &Args) -> Result<(), Error> { console::initialize(&args.console); - let config = ConfigRoot::new(&args.config).map_err(|err| Error::config(err))?; + let config = ConfigRoot::new(&args.config).map_err(Error::config)?; - let chain = config.chain.unwrap_or_default().into(); + let chain = config.chain.unwrap_or_default(); let cursor = Cursor::new(config.intersect.into()); - let error_policy = config.policy.unwrap_or_default().into(); + let error_policy = config.policy.unwrap_or_default(); let finalize = config.finalize; let current_dir = std::env::current_dir().unwrap(); diff --git a/src/filters/deno/mod.rs b/src/filters/deno/mod.rs index c20ad314..6ab025e5 100644 --- a/src/filters/deno/mod.rs +++ b/src/filters/deno/mod.rs @@ -1,17 +1,15 @@ //! A mapper with custom logic from using the Deno runtime -use deno_core::{op, Extension, ModuleSpecifier, OpState, Snapshot}; +use deno_core::{op, Extension, ModuleSpecifier, OpState}; use deno_runtime::permissions::PermissionsContainer; use deno_runtime::worker::{MainWorker as DenoWorker, WorkerOptions}; use deno_runtime::BootstrapOptions; use gasket::{messaging::*, runtime::Tether}; use serde::Deserialize; use serde_json::json; -use std::ops::Deref; -use std::ops::DerefMut; use std::path::PathBuf; use tokio::runtime::Runtime as TokioRuntime; -use tracing::{debug, trace}; +use tracing::trace; use crate::framework::*; @@ -151,7 +149,7 @@ impl gasket::runtime::Worker for Worker { } } } - ChainEvent::Undo(p, r) => todo!(), + ChainEvent::Undo(..) => todo!(), ChainEvent::Reset(p) => { self.output.send(ChainEvent::reset(p))?; } @@ -189,7 +187,7 @@ pub struct Config { } impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { + pub fn bootstrapper(self, _ctx: &Context) -> Result { // let main_module = // deno_core::resolve_path(&self.main_module, // &ctx.current_dir).map_err(Error::config)?; diff --git a/src/filters/dsl.rs b/src/filters/dsl.rs index ad16fbbf..5dd3e640 100644 --- a/src/filters/dsl.rs +++ b/src/filters/dsl.rs @@ -214,9 +214,9 @@ impl Predicate { } } -#[derive(Default)] struct Worker { msg_count: gasket::metrics::Counter, + predicate: Predicate, input: FilterInputPort, output: FilterOutputPort, } @@ -231,9 +231,14 @@ impl gasket::runtime::Worker for Worker { fn work(&mut self) -> gasket::runtime::WorkResult { let msg = self.input.recv_or_idle()?; - todo!(); - - self.output.send(msg)?; + match &msg.payload { + ChainEvent::Apply(_, Record::OuraV1Event(x)) => { + if self.predicate.event_matches(x) { + self.output.send(msg)?; + } + } + _ => todo!(), + } Ok(gasket::runtime::WorkOutcome::Partial) } @@ -263,12 +268,17 @@ impl Bootstrapper { #[derive(Debug, Deserialize)] pub struct Config { - pub check: Predicate, + pub predicate: Predicate, } impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { - let worker = Worker::default(); + pub fn bootstrapper(self, _ctx: &Context) -> Result { + let worker = Worker { + predicate: self.predicate, + msg_count: Default::default(), + input: Default::default(), + output: Default::default(), + }; Ok(Bootstrapper(worker)) } diff --git a/src/filters/json/mod.rs b/src/filters/json/mod.rs index 8c03b87c..bd4c13da 100644 --- a/src/filters/json/mod.rs +++ b/src/filters/json/mod.rs @@ -53,7 +53,7 @@ impl Bootstrapper { pub struct Config {} impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { + pub fn bootstrapper(self, _ctx: &Context) -> Result { let worker = Worker::default(); Ok(Bootstrapper(worker)) diff --git a/src/filters/legacy_v1/map.rs b/src/filters/legacy_v1/map.rs index fdb3b119..d7ad22a4 100644 --- a/src/filters/legacy_v1/map.rs +++ b/src/filters/legacy_v1/map.rs @@ -5,7 +5,7 @@ use pallas::ledger::primitives::babbage::{MintedDatumOption, NetworkId}; use pallas::ledger::primitives::{ alonzo::{ self as alonzo, Certificate, InstantaneousRewardSource, InstantaneousRewardTarget, - Metadatum, MetadatumLabel, Relay, Value, + Metadatum, MetadatumLabel, Relay, }, babbage, ToCanonicalJson, }; @@ -106,13 +106,6 @@ fn metadatum_to_string_key(datum: &Metadatum) -> String { } } -fn get_tx_output_coin_value(amount: &Value) -> u64 { - match amount { - Value::Coin(x) => *x, - Value::Multiasset(x, _) => *x, - } -} - impl EventWriter<'_> { pub fn to_transaction_input_record(&self, input: &MultiEraInput) -> TxInputRecord { TxInputRecord { @@ -333,7 +326,7 @@ impl EventWriter<'_> { pub fn to_mint_record(&self, asset: &MultiEraAsset) -> MintRecord { MintRecord { policy: asset.policy().map(|x| x.to_string()).unwrap_or_default(), - asset: asset.name().map(|x| hex::encode(x)).unwrap_or_default(), + asset: asset.name().map(hex::encode).unwrap_or_default(), quantity: asset.coin(), } } @@ -455,11 +448,7 @@ impl EventWriter<'_> { } pub fn to_certificate_event(&self, cert: &MultiEraCert) -> Option { - if !cert.as_alonzo().is_some() { - return None; - } - - let evt = match cert.as_alonzo().unwrap() { + let evt = match cert.as_alonzo()? { Certificate::StakeRegistration(credential) => EventData::StakeRegistration { credential: credential.into(), }, diff --git a/src/filters/noop.rs b/src/filters/noop.rs index 90c89934..74d54d8e 100644 --- a/src/filters/noop.rs +++ b/src/filters/noop.rs @@ -54,7 +54,7 @@ impl Bootstrapper { pub struct Config {} impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { + pub fn bootstrapper(self, _ctx: &Context) -> Result { let worker = Worker::default(); Ok(Bootstrapper(worker)) diff --git a/src/filters/wasm/mod.rs b/src/filters/wasm/mod.rs index 1fb42934..2432eb2a 100644 --- a/src/filters/wasm/mod.rs +++ b/src/filters/wasm/mod.rs @@ -53,7 +53,7 @@ impl Bootstrapper { pub struct Config {} impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { + pub fn bootstrapper(self, _ctx: &Context) -> Result { let worker = Worker::default(); Ok(Bootstrapper(worker)) diff --git a/src/framework/errors.rs b/src/framework/errors.rs index d51b67a3..e3ef2425 100644 --- a/src/framework/errors.rs +++ b/src/framework/errors.rs @@ -27,19 +27,14 @@ impl Error { } } -#[derive(Clone, Serialize, Deserialize, PartialEq, PartialOrd)] +#[derive(Clone, Serialize, Deserialize, PartialEq, PartialOrd, Default)] pub enum ErrorAction { Skip, Warn, + #[default] Default, } -impl Default for ErrorAction { - fn default() -> Self { - ErrorAction::Default - } -} - #[derive(Clone, Serialize, Deserialize, Default)] pub struct RuntimePolicy { pub parse_errors: Option, diff --git a/src/framework/mod.rs b/src/framework/mod.rs index d690b91e..ef298893 100644 --- a/src/framework/mod.rs +++ b/src/framework/mod.rs @@ -1,6 +1,5 @@ //! Internal pipeline framework -use gasket::messaging::SendAdapter; use pallas::ledger::traverse::wellknown::GenesisValues; use serde::Deserialize; use std::collections::VecDeque; diff --git a/src/lib.rs b/src/lib.rs index f1053f69..42aeeccb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(pin_macro)] - pub mod filters; pub mod framework; pub mod sinks; diff --git a/src/sinks/noop.rs b/src/sinks/noop.rs index f2d02c12..ff4eafa8 100644 --- a/src/sinks/noop.rs +++ b/src/sinks/noop.rs @@ -47,7 +47,7 @@ impl Bootstrapper { pub struct Config {} impl Config { - pub fn bootstrapper(self, ctx: &Context) -> Result { + pub fn bootstrapper(self, _ctx: &Context) -> Result { let worker = Worker::default(); Ok(Bootstrapper(worker)) diff --git a/src/sinks/terminal/format.rs b/src/sinks/terminal/format.rs index bcc250e6..30b5a437 100644 --- a/src/sinks/terminal/format.rs +++ b/src/sinks/terminal/format.rs @@ -1,7 +1,4 @@ -use std::{ - fmt::{Display, Write}, - ops::Deref, -}; +use std::fmt::{Display, Write}; use crossterm::style::{Attribute, Color, Stylize}; use pallas::network::miniprotocols::Point; @@ -366,7 +363,7 @@ impl LogLine { } } - pub fn new_reset(point: Point) -> LogLine { + pub fn new_reset(_point: Point) -> LogLine { todo!() } } diff --git a/src/sinks/terminal/run.rs b/src/sinks/terminal/run.rs index 3acc256e..63267691 100644 --- a/src/sinks/terminal/run.rs +++ b/src/sinks/terminal/run.rs @@ -25,7 +25,7 @@ impl Worker { return None; } - if let Ok((x, y)) = crossterm::terminal::size() { + if let Ok((x, _y)) = crossterm::terminal::size() { return Some(x as usize); } diff --git a/src/sources/mod.rs b/src/sources/mod.rs index 9758107a..25731dc9 100644 --- a/src/sources/mod.rs +++ b/src/sources/mod.rs @@ -21,7 +21,7 @@ impl StageBootstrapper for Bootstrapper { } } - fn connect_input(&mut self, adapter: InputAdapter) { + fn connect_input(&mut self, _: InputAdapter) { panic!("attempted to use source stage as receiver"); } diff --git a/src/sources/n2n/mod.rs b/src/sources/n2n/mod.rs index 22476002..cb90fc98 100644 --- a/src/sources/n2n/mod.rs +++ b/src/sources/n2n/mod.rs @@ -1,4 +1,4 @@ -use gasket::{messaging::SendPort, runtime::Tether}; +use gasket::runtime::Tether; use pallas::network::upstream::n2n::{ Bootstrapper as PallasBootstrapper, Runtime as PallasRuntime, };