From 5e065498acbf6b2658a51ecc10780c52cea3a7cf Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:01:52 -0400 Subject: [PATCH 01/51] chore: fix clippy warnings in clarity --- clarity/src/vm/analysis/type_checker/v2_05/tests/mod.rs | 2 +- clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs | 2 +- clarity/src/vm/ast/mod.rs | 2 +- clarity/src/vm/ast/parser/v1.rs | 4 ++-- clarity/src/vm/ast/parser/v2/mod.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clarity/src/vm/analysis/type_checker/v2_05/tests/mod.rs b/clarity/src/vm/analysis/type_checker/v2_05/tests/mod.rs index 22b87e4256..59488e8056 100644 --- a/clarity/src/vm/analysis/type_checker/v2_05/tests/mod.rs +++ b/clarity/src/vm/analysis/type_checker/v2_05/tests/mod.rs @@ -1441,7 +1441,7 @@ fn test_response_inference() { fn test_function_arg_names() { use crate::vm::analysis::type_check; - let functions = vec![ + let functions = [ "(define-private (test (x int)) (ok 0)) (define-public (test-pub (x int)) (ok 0)) (define-read-only (test-ro (x int)) (ok 0))", diff --git a/clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs b/clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs index 24263c7a8d..fd9b4df5fa 100644 --- a/clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs +++ b/clarity/src/vm/analysis/type_checker/v2_1/tests/mod.rs @@ -2239,7 +2239,7 @@ fn test_response_inference(#[case] version: ClarityVersion, #[case] epoch: Stack fn test_function_arg_names() { use crate::vm::analysis::type_check; - let functions = vec![ + let functions = [ "(define-private (test (x int)) (ok 0)) (define-public (test-pub (x int)) (ok 0)) (define-read-only (test-ro (x int)) (ok 0))", diff --git a/clarity/src/vm/ast/mod.rs b/clarity/src/vm/ast/mod.rs index 7bfa61b7f1..d5c2167992 100644 --- a/clarity/src/vm/ast/mod.rs +++ b/clarity/src/vm/ast/mod.rs @@ -44,7 +44,7 @@ use crate::vm::types::QualifiedContractIdentifier; use crate::vm::ClarityVersion; /// Legacy function -#[cfg(any(test, features = "testing"))] +#[cfg(any(test, feature = "testing"))] pub fn parse( contract_identifier: &QualifiedContractIdentifier, source_code: &str, diff --git a/clarity/src/vm/ast/parser/v1.rs b/clarity/src/vm/ast/parser/v1.rs index d3cfb2c62c..7ba15cfc97 100644 --- a/clarity/src/vm/ast/parser/v1.rs +++ b/clarity/src/vm/ast/parser/v1.rs @@ -132,11 +132,11 @@ lazy_static! { static ref lex_matchers: Vec = vec![ LexMatcher::new( - r##"u"(?P((\\")|([[ -~]&&[^"]]))*)""##, + r#"u"(?P((\\")|([[ -~]&&[^"]]))*)""#, TokenType::StringUTF8Literal, ), LexMatcher::new( - r##""(?P((\\")|([[ -~]&&[^"]]))*)""##, + r#""(?P((\\")|([[ -~]&&[^"]]))*)""#, TokenType::StringASCIILiteral, ), LexMatcher::new(";;[ -~]*", TokenType::Whitespace), // ;; comments. diff --git a/clarity/src/vm/ast/parser/v2/mod.rs b/clarity/src/vm/ast/parser/v2/mod.rs index 582bfe14e0..4032f7fa72 100644 --- a/clarity/src/vm/ast/parser/v2/mod.rs +++ b/clarity/src/vm/ast/parser/v2/mod.rs @@ -236,7 +236,7 @@ impl<'a> Parser<'a> { Token::Rparen => { span.end_line = token.span.end_line; span.end_column = token.span.end_column; - let out_nodes: Vec<_> = nodes.drain(..).collect(); + let out_nodes: Vec<_> = std::mem::take(nodes); let mut e = PreSymbolicExpression::list(out_nodes.into_boxed_slice()); e.copy_span(span); Ok(Some(e)) @@ -253,7 +253,7 @@ impl<'a> Parser<'a> { )?; span.end_line = token.span.end_line; span.end_column = token.span.end_column; - let out_nodes: Vec<_> = nodes.drain(..).collect(); + let out_nodes: Vec<_> = std::mem::take(nodes); let mut e = PreSymbolicExpression::list(out_nodes.into_boxed_slice()); e.copy_span(span); Ok(Some(e)) From 13c33d65d7761bcb8874308e440eedb47f14215d Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:10:50 -0400 Subject: [PATCH 02/51] chore: fix clippy issues in stacks-common --- stacks-common/src/util/hash.rs | 21 ++++++++------------- stacks-common/src/util/macros.rs | 3 +-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/stacks-common/src/util/hash.rs b/stacks-common/src/util/hash.rs index f365aaa508..c98d801092 100644 --- a/stacks-common/src/util/hash.rs +++ b/stacks-common/src/util/hash.rs @@ -605,20 +605,15 @@ pub fn hex_bytes(s: &str) -> Result, HexError> { let mut v = vec![]; let mut iter = s.chars().pair(); // Do the parsing - iter.by_ref().fold(Ok(()), |e, (f, s)| { - if e.is_err() { - e - } else { - match (f.to_digit(16), s.to_digit(16)) { - (None, _) => Err(HexError::BadCharacter(f)), - (_, None) => Err(HexError::BadCharacter(s)), - (Some(f), Some(s)) => { - v.push((f * 0x10 + s) as u8); - Ok(()) - } + iter.by_ref() + .try_fold((), |_, (f, s)| match (f.to_digit(16), s.to_digit(16)) { + (None, _) => Err(HexError::BadCharacter(f)), + (_, None) => Err(HexError::BadCharacter(s)), + (Some(f), Some(s)) => { + v.push((f * 0x10 + s) as u8); + Ok(()) } - } - })?; + })?; // Check that there was no remainder match iter.remainder() { Some(_) => Err(HexError::BadLength(s.len())), diff --git a/stacks-common/src/util/macros.rs b/stacks-common/src/util/macros.rs index 16320c948d..3a683b19f4 100644 --- a/stacks-common/src/util/macros.rs +++ b/stacks-common/src/util/macros.rs @@ -355,11 +355,10 @@ macro_rules! impl_array_newtype { } } - #[cfg_attr(feature = "clippy", allow(expl_impl_clone_on_copy))] // we don't define the `struct`, we have to explicitly impl impl Clone for $thing { #[inline] fn clone(&self) -> $thing { - $thing::from(&self[..]) + *self } } From febb45f620d803fcaba2a1b41ec6e6557bfce8af Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:17:15 -0400 Subject: [PATCH 03/51] ci: enable clippy when opening PRs to develop Packages enabled so far: - clarity - libstackerdb - pox-locking - stacks-common --- .github/workflows/ci.yml | 4 ++++ .github/workflows/clippy.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 605b0818c0..3d9f55691b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,10 @@ jobs: id: rustfmt uses: actions-rust-lang/rustfmt@v1 + clippy: + name: Clippy + uses: ./github/workflows/clippy.yml + ## Release tests: Execute on every run release-tests: name: Release Tests diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 1e6872bd69..2f741d931a 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -41,4 +41,4 @@ jobs: uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - args: --all-features + args: -p clarity -p libstackerdb -p pox-locking -p stacks-common --no-deps --tests --all-features -- -D warnings From 3bde2bcca716a0c8b553e1d868b206803df6b4b6 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:26:19 -0400 Subject: [PATCH 04/51] chore: fix new clippy warnings --- stacks-common/src/types/net.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/stacks-common/src/types/net.rs b/stacks-common/src/types/net.rs index 45b6fb43ef..25c86a82de 100644 --- a/stacks-common/src/types/net.rs +++ b/stacks-common/src/types/net.rs @@ -107,9 +107,7 @@ impl PeerAddress { /// order. Return None if this is not an IPv4 address. pub fn ipv4_bits(&self) -> Option { let octets_opt = self.ipv4_octets(); - if octets_opt.is_none() { - return None; - } + octets_opt?; let octets = octets_opt.unwrap(); Some( @@ -291,8 +289,8 @@ impl FromStr for PeerHost { // try as DNS-name:port let host; let port; - let parts: Vec<&str> = header.split(":").collect(); - if parts.len() == 0 { + let parts: Vec<&str> = header.split(':').collect(); + if parts.is_empty() { return Err(Error::DecodeError( "Failed to parse PeerHost: no parts".to_string(), )); @@ -305,7 +303,7 @@ impl FromStr for PeerHost { if parts[np - 1].chars().all(char::is_numeric) { // ends in :port let host_str = parts[0..np - 1].join(":"); - if host_str.len() == 0 { + if host_str.is_empty() { return Err(Error::DecodeError("Empty host".to_string())); } host = Some(host_str); From c273532238a41d60d59061cd6f1adbb30e09f262 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:38:02 -0400 Subject: [PATCH 05/51] ci: revert changes in ci.yml --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d9f55691b..605b0818c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,10 +42,6 @@ jobs: id: rustfmt uses: actions-rust-lang/rustfmt@v1 - clippy: - name: Clippy - uses: ./github/workflows/clippy.yml - ## Release tests: Execute on every run release-tests: name: Release Tests From e939a5ba08a4c91ce0a13d6d8a070c090cb7e981 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 15:45:55 -0400 Subject: [PATCH 06/51] ci: re-enable the clippy job --- .github/workflows/clippy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 2f741d931a..77853bfacd 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -1,5 +1,3 @@ -# Disabled - this workflow needs more work so it's not incredibly chatty -## ## Perform Clippy checks - currently set to defaults ## https://github.com/rust-lang/rust-clippy#usage ## https://rust-lang.github.io/rust-clippy/master/index.html @@ -20,7 +18,6 @@ on: jobs: clippy_check: - if: ${{ false }} name: Clippy Check runs-on: ubuntu-latest steps: From b837de5489ea71c52fb21b7e633528ec01ddcb48 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 16:05:11 -0400 Subject: [PATCH 07/51] ci: run clippy on PR "synchronize"" events --- .github/workflows/clippy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 77853bfacd..93f619b7b5 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -15,6 +15,7 @@ on: types: - opened - reopened + - synchronize jobs: clippy_check: From 43dfe67facebe6c33273d766610a23abaac595dd Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 16:12:31 -0400 Subject: [PATCH 08/51] chore: fix new clippy warning in stacks-common --- stacks-common/src/util/log.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stacks-common/src/util/log.rs b/stacks-common/src/util/log.rs index 0889fc6a8f..3aa2a1e5af 100644 --- a/stacks-common/src/util/log.rs +++ b/stacks-common/src/util/log.rs @@ -238,8 +238,7 @@ fn make_logger() -> Logger { let plain = slog_term::PlainSyncDecorator::new(slog_term::TestStdoutWriter); let isatty = isatty(Stream::Stdout); let drain = TermFormat::new(plain, false, debug, isatty); - let logger = Logger::root(drain.ignore_res(), o!()); - logger + Logger::root(drain.ignore_res(), o!()) } } From 6315b179642edc53af89fd14d31e3fd739e0f285 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Wed, 1 Nov 2023 16:38:47 -0400 Subject: [PATCH 09/51] chore: fix more clippy errors --- clarity/src/vm/analysis/errors.rs | 2 +- stacks-common/src/util/pipe.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clarity/src/vm/analysis/errors.rs b/clarity/src/vm/analysis/errors.rs index 9aeb878f2d..81ae521c95 100644 --- a/clarity/src/vm/analysis/errors.rs +++ b/clarity/src/vm/analysis/errors.rs @@ -216,7 +216,7 @@ impl CheckError { pub fn set_expressions(&mut self, exprs: &[SymbolicExpression]) { self.diagnostic.spans = exprs.iter().map(|e| e.span().clone()).collect(); - self.expressions.replace(exprs.clone().to_vec()); + self.expressions.replace(exprs.to_vec()); } } diff --git a/stacks-common/src/util/pipe.rs b/stacks-common/src/util/pipe.rs index d850826fd4..87cf461b8f 100644 --- a/stacks-common/src/util/pipe.rs +++ b/stacks-common/src/util/pipe.rs @@ -402,8 +402,7 @@ mod test { #[test] fn test_connection_pipe_producer_consumer() { - let mut buf = Vec::new(); - buf.resize(1048576, 0); + let mut buf = vec![0; 1048576]; let mut rng = rand::thread_rng(); rng.fill_bytes(&mut buf); From 0c4c7edfcfc2e0c3cd1103812f588a080e577004 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Wed, 20 Dec 2023 01:42:09 +0200 Subject: [PATCH 10/51] feat: ready source branch --- clarity/Cargo.toml | 2 +- clarity/src/{libclarity.rs => lib.rs} | 0 libsigner/Cargo.toml | 2 +- libsigner/src/{libsigner.rs => lib.rs} | 0 stacks-common/Cargo.toml | 2 +- stacks-common/src/{libcommon.rs => lib.rs} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename clarity/src/{libclarity.rs => lib.rs} (100%) rename libsigner/src/{libsigner.rs => lib.rs} (100%) rename stacks-common/src/{libcommon.rs => lib.rs} (100%) diff --git a/clarity/Cargo.toml b/clarity/Cargo.toml index 86089991dc..e83c77f823 100644 --- a/clarity/Cargo.toml +++ b/clarity/Cargo.toml @@ -15,7 +15,7 @@ resolver = "2" [lib] name = "clarity" -path = "./src/libclarity.rs" +path = "./src/lib.rs" [dependencies] rand = "0.7.3" diff --git a/clarity/src/libclarity.rs b/clarity/src/lib.rs similarity index 100% rename from clarity/src/libclarity.rs rename to clarity/src/lib.rs diff --git a/libsigner/Cargo.toml b/libsigner/Cargo.toml index 8500ef55fa..35aaca69f7 100644 --- a/libsigner/Cargo.toml +++ b/libsigner/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" [lib] name = "libsigner" -path = "./src/libsigner.rs" +path = "./src/lib.rs" [dependencies] clarity = { path = "../clarity" } diff --git a/libsigner/src/libsigner.rs b/libsigner/src/lib.rs similarity index 100% rename from libsigner/src/libsigner.rs rename to libsigner/src/lib.rs diff --git a/stacks-common/Cargo.toml b/stacks-common/Cargo.toml index 863a82d53c..650446ea25 100644 --- a/stacks-common/Cargo.toml +++ b/stacks-common/Cargo.toml @@ -15,7 +15,7 @@ edition = "2021" [lib] name = "stacks_common" -path = "./src/libcommon.rs" +path = "./src/lib.rs" [dependencies] rand = "0.7.3" diff --git a/stacks-common/src/libcommon.rs b/stacks-common/src/lib.rs similarity index 100% rename from stacks-common/src/libcommon.rs rename to stacks-common/src/lib.rs From ce1d7ff81b1799c6f9d40dd127edca5479c98f40 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 02:29:41 +0200 Subject: [PATCH 11/51] feat: trigger ci --- Cargo.lock | 225 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 207 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f0d0c6217..333d246c18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -450,6 +450,28 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -584,6 +606,15 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "0.1.10" @@ -636,6 +667,17 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "2.34.0" @@ -1112,23 +1154,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1417,6 +1448,12 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "gloo-timers" version = "0.2.6" @@ -1877,11 +1914,17 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "libc" -version = "0.2.140" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libflate" @@ -1903,6 +1946,16 @@ dependencies = [ "rle-decode-fast", ] +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + [[package]] name = "libsigner" version = "0.0.1" @@ -1963,6 +2016,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + [[package]] name = "log" version = "0.4.17" @@ -2022,6 +2081,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2134,6 +2199,16 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2268,7 +2343,10 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256k1" version = "5.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e81c2cb5a1936d3f26278f9d698932239d03ddf0d5818392d91cd5f98ffc79" dependencies = [ + "bindgen", "bitvec", "bs58 0.4.0", "cc", @@ -2317,6 +2395,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "percent-encoding" version = "2.2.0" @@ -2879,6 +2963,12 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -2935,10 +3025,23 @@ dependencies = [ "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.45.0", ] +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" version = "0.21.7" @@ -3283,6 +3386,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + [[package]] name = "simple-mutex" version = "1.1.5" @@ -3671,7 +3780,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.7", "windows-sys 0.45.0", ] @@ -4352,6 +4461,18 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.28", +] + [[package]] name = "winapi" version = "0.2.8" @@ -4428,6 +4549,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -4458,6 +4588,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -4470,6 +4615,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -4482,6 +4633,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -4494,6 +4651,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -4506,6 +4669,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -4518,6 +4687,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -4530,6 +4705,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -4542,6 +4723,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.5.15" @@ -4574,6 +4761,8 @@ dependencies = [ [[package]] name = "wsts" version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0c0ec44cbd35be82490c8c566ad4971f7b41ffe8508f1c9938140df7fe18b2" dependencies = [ "aes-gcm 0.10.2", "bs58 0.5.0", From a9303de2c9fd3411fe4a083d8f59ed3cad27c520 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 16:57:45 +0200 Subject: [PATCH 12/51] feat: run the workflow again --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..9cdc47d86d 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -6,7 +6,7 @@ #![allow(non_upper_case_globals)] #![cfg_attr(test, allow(unused_variables, unused_assignments))] #![allow(clippy::assertions_on_constants)] - +// test extern crate curve25519_dalek; extern crate ed25519_dalek; extern crate rand; From 362df439fd76dea23b1d0a95bbb63eba50a14c69 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 17:22:32 +0200 Subject: [PATCH 13/51] feat: run workflow again --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index 9cdc47d86d..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -6,7 +6,7 @@ #![allow(non_upper_case_globals)] #![cfg_attr(test, allow(unused_variables, unused_assignments))] #![allow(clippy::assertions_on_constants)] -// test + extern crate curve25519_dalek; extern crate ed25519_dalek; extern crate rand; From 1f7e4d49ca1d9e2fc26c4b92261e05df5eb1c5d9 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 20:31:03 +0200 Subject: [PATCH 14/51] feat: trigger workflow --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..9cdc47d86d 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -6,7 +6,7 @@ #![allow(non_upper_case_globals)] #![cfg_attr(test, allow(unused_variables, unused_assignments))] #![allow(clippy::assertions_on_constants)] - +// test extern crate curve25519_dalek; extern crate ed25519_dalek; extern crate rand; From 4e8f18d5cf9284ed57635609efff47000e1444b4 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 20:35:15 +0200 Subject: [PATCH 15/51] feat: trigger workflow --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index 9cdc47d86d..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -6,7 +6,7 @@ #![allow(non_upper_case_globals)] #![cfg_attr(test, allow(unused_variables, unused_assignments))] #![allow(clippy::assertions_on_constants)] -// test + extern crate curve25519_dalek; extern crate ed25519_dalek; extern crate rand; From b12c7e7d5260bfe759122541d0f804aa0d33476c Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Thu, 28 Dec 2023 20:50:57 +0200 Subject: [PATCH 16/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From c5ebc9540f8d21da6472dfa60ed5b81750fa3ca4 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 29 Dec 2023 03:45:28 +0200 Subject: [PATCH 17/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 237b681f84262a05e57cb31ef2a20b99118e28d1 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 29 Dec 2023 03:57:34 +0200 Subject: [PATCH 18/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From ba7acc958b920035c042c09965d4c49b8aa27e99 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:03:05 +0200 Subject: [PATCH 19/51] feat: retry with repo checkout --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 74fa4648c95b149043057757829111168c926540 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:06:07 +0200 Subject: [PATCH 20/51] feat: retry running after cargo mutants is installed --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From e344fafc5f1f3142265bcc3cbb1e508290a7bebf Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:10:14 +0200 Subject: [PATCH 21/51] feat: retry run after output format --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 2acbcfc08d17b26dce3834f40db3e50a5bbfcc3d Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:18:09 +0200 Subject: [PATCH 22/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From 7a8061dd56da305703c40be76812fc4c7804a6df Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:31:49 +0200 Subject: [PATCH 23/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 4ae230cd079fe43b6d0fa915fa2108d66a4e0b93 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:37:36 +0200 Subject: [PATCH 24/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From aec2c7bd8897b8e07df5638db9ce6b4ba1baca04 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 02:52:55 +0200 Subject: [PATCH 25/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 25d8791149fb662b05cf403baea0a733d065a7ae Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 03:09:10 +0200 Subject: [PATCH 26/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From 61403e230e441e563c52c949afa5360912ebe130 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 03:15:05 +0200 Subject: [PATCH 27/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 2e69bc20e2434d2dc64aca15555ceeed2ee14927 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 03:30:04 +0200 Subject: [PATCH 28/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From baffc138e973fb029b9e9e1f4c445b49713c3e36 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 03:34:09 +0200 Subject: [PATCH 29/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 552499eab040b42a6b4f816db4a655787b3a7966 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Fri, 5 Jan 2024 03:45:59 +0200 Subject: [PATCH 30/51] feat: remove clarity from big packages for testing --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From 9d68ded58f1af0152adba4eaf71f42e9ab2ee2b9 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 05:46:06 +0200 Subject: [PATCH 31/51] feat: run again with clarity as a big package --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 96a5160a1ffd75eaf25d18f93261e4ebad769202 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 05:53:04 +0200 Subject: [PATCH 32/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From 26fe61cd5ee2f6ac3f2bae2612d4a0ee1595de9e Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 05:57:47 +0200 Subject: [PATCH 33/51] feat: run again after changing operators --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 3e017928a362aed96fd89881910665a0014559f4 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:05:17 +0200 Subject: [PATCH 34/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From b1ec334cd1e88bd6e1c4c04d59e5aaa642319c3c Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:19:26 +0200 Subject: [PATCH 35/51] feat: add 26 mutants to test the shards case on big package --- stackslib/src/burnchains/affirmation.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stackslib/src/burnchains/affirmation.rs b/stackslib/src/burnchains/affirmation.rs index b7a83f2f1b..8797ed1391 100644 --- a/stackslib/src/burnchains/affirmation.rs +++ b/stackslib/src/burnchains/affirmation.rs @@ -611,6 +611,10 @@ pub fn read_prepare_phase_commits( Ok(ret) } +pub fn test_mutants_big_package() -> (Option, Option, Option) { + (None, None, None) +} + /// Find all referenced parent block-commits already in the burnchain DB, so we can extract their VRF seeds. /// If this method errors out, it's because it couldn't read the burnchain headers DB (or it's /// corrupted). Either way, the caller may treat this as a fatal condition. From f4a094e5ead805d592b62347e9d9daae2b5a004b Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:23:24 +0200 Subject: [PATCH 36/51] feat: add 80 mutants on small package - to test if they still go on the normal case, no shards, since the big packages run on shards (would need 120 for them to run with shards) --- stacks-common/src/types/chainstate.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index 46a9afb0e2..8027ed0d5c 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -430,3 +430,7 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { Ok((consensus_hash, burn_header_hash)) } } + +pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { + (None, None, None, None) +} From bde71412dfc9afa255e33190ef98633965dabd19 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:25:24 +0200 Subject: [PATCH 37/51] feat: remove big package mutants to test - now with the 80 mutants added in the previous commit it should run with shards on the small packages (since the limit is 80 now) --- stackslib/src/burnchains/affirmation.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stackslib/src/burnchains/affirmation.rs b/stackslib/src/burnchains/affirmation.rs index 8797ed1391..b7a83f2f1b 100644 --- a/stackslib/src/burnchains/affirmation.rs +++ b/stackslib/src/burnchains/affirmation.rs @@ -611,10 +611,6 @@ pub fn read_prepare_phase_commits( Ok(ret) } -pub fn test_mutants_big_package() -> (Option, Option, Option) { - (None, None, None) -} - /// Find all referenced parent block-commits already in the burnchain DB, so we can extract their VRF seeds. /// If this method errors out, it's because it couldn't read the burnchain headers DB (or it's /// corrupted). Either way, the caller may treat this as a fatal condition. From daf011e002005235cfe5560e7028bb3cb9d5f063 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:28:47 +0200 Subject: [PATCH 38/51] feat: run both big and small packages with shards - added back the 26 mutants on the big packages, and 80 more on the small packages (totaling to 160 new mutants, which are more than the limit of 120 in order to run with shards) --- stacks-common/src/types/chainstate.rs | 4 ++++ stackslib/src/burnchains/affirmation.rs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index 8027ed0d5c..8af2664e9f 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -434,3 +434,7 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { (None, None, None, None) } + +pub fn test_mutants_small_package_2() -> (Option, Option, Option, Option) { + (None, None, None, None) +} diff --git a/stackslib/src/burnchains/affirmation.rs b/stackslib/src/burnchains/affirmation.rs index b7a83f2f1b..8797ed1391 100644 --- a/stackslib/src/burnchains/affirmation.rs +++ b/stackslib/src/burnchains/affirmation.rs @@ -611,6 +611,10 @@ pub fn read_prepare_phase_commits( Ok(ret) } +pub fn test_mutants_big_package() -> (Option, Option, Option) { + (None, None, None) +} + /// Find all referenced parent block-commits already in the burnchain DB, so we can extract their VRF seeds. /// If this method errors out, it's because it couldn't read the burnchain headers DB (or it's /// corrupted). Either way, the caller may treat this as a fatal condition. From 8e1130b6a562dc9a687c7920ced258813d17296e Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:31:13 +0200 Subject: [PATCH 39/51] feat: run with 160 mutants on small and none on big packages --- stackslib/src/burnchains/affirmation.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stackslib/src/burnchains/affirmation.rs b/stackslib/src/burnchains/affirmation.rs index 8797ed1391..b7a83f2f1b 100644 --- a/stackslib/src/burnchains/affirmation.rs +++ b/stackslib/src/burnchains/affirmation.rs @@ -611,10 +611,6 @@ pub fn read_prepare_phase_commits( Ok(ret) } -pub fn test_mutants_big_package() -> (Option, Option, Option) { - (None, None, None) -} - /// Find all referenced parent block-commits already in the burnchain DB, so we can extract their VRF seeds. /// If this method errors out, it's because it couldn't read the burnchain headers DB (or it's /// corrupted). Either way, the caller may treat this as a fatal condition. From 79340f8c809c456b4ef10d5c910d3b1c2a6df276 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:33:51 +0200 Subject: [PATCH 40/51] feat: run with 80 mutants on small and none on big packages --- stacks-common/src/types/chainstate.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index 8af2664e9f..8027ed0d5c 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -434,7 +434,3 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { (None, None, None, None) } - -pub fn test_mutants_small_package_2() -> (Option, Option, Option, Option) { - (None, None, None, None) -} From a3f8b82ac12318f0a330dd6e54762d201b69d497 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:37:30 +0200 Subject: [PATCH 41/51] feat: try again --- stacks-common/src/types/chainstate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index 8027ed0d5c..d1bfd17485 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -432,5 +432,5 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { } pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { - (None, None, None, None) + (None, None, None, Some(1)) } From 52589102c70c5106d2d622ff37fd74412ce46abb Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:46:07 +0200 Subject: [PATCH 42/51] feat: run again --- stacks-common/src/types/chainstate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index d1bfd17485..8027ed0d5c 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -432,5 +432,5 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { } pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { - (None, None, None, Some(1)) + (None, None, None, None) } From e5b966a6e56530ed7476e1c76a9a4a91d0641d19 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:51:13 +0200 Subject: [PATCH 43/51] feat: run again --- stacks-common/src/types/chainstate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index 8027ed0d5c..d1bfd17485 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -432,5 +432,5 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { } pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { - (None, None, None, None) + (None, None, None, Some(1)) } From 4b0fccfac5a1bb2ff1527f8b8311ba3be7fe83f8 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 06:53:49 +0200 Subject: [PATCH 44/51] feat: revert all changes, run completely to test output --- stacks-common/src/types/chainstate.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stacks-common/src/types/chainstate.rs b/stacks-common/src/types/chainstate.rs index d1bfd17485..46a9afb0e2 100644 --- a/stacks-common/src/types/chainstate.rs +++ b/stacks-common/src/types/chainstate.rs @@ -430,7 +430,3 @@ impl StacksMessageCodec for (ConsensusHash, BurnchainHeaderHash) { Ok((consensus_hash, burn_header_hash)) } } - -pub fn test_mutants_small_package() -> (Option, Option, Option, Option) { - (None, None, None, Some(1)) -} From cb56718f22107cb6d2eae5defb59b3c9d7532569 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 07:08:16 +0200 Subject: [PATCH 45/51] feat: add a mutant on big package to test output --- stackslib/src/burnchains/affirmation.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stackslib/src/burnchains/affirmation.rs b/stackslib/src/burnchains/affirmation.rs index b7a83f2f1b..02dccdf420 100644 --- a/stackslib/src/burnchains/affirmation.rs +++ b/stackslib/src/burnchains/affirmation.rs @@ -611,6 +611,10 @@ pub fn read_prepare_phase_commits( Ok(ret) } +pub fn test_mutants_big_packages(prepare_phase_ops: LeaderBlockCommitOp) -> LeaderBlockCommitOp { + prepare_phase_ops +} + /// Find all referenced parent block-commits already in the burnchain DB, so we can extract their VRF seeds. /// If this method errors out, it's because it couldn't read the burnchain headers DB (or it's /// corrupted). Either way, the caller may treat this as a fatal condition. From 7afa667c92a8627d7ef14f2d3d31335b28fd46d9 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 07:46:04 +0200 Subject: [PATCH 46/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From b8e9cf86484c8383c5c239d1a5fcb30059e236e2 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 18:41:02 +0200 Subject: [PATCH 47/51] feat: run again after output handling for failed mutants --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; + #[macro_use] extern crate lazy_static; extern crate ripemd; From 712c4e9ef4360f9d5e6ed22e7c30d80211b52deb Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 19:26:39 +0200 Subject: [PATCH 48/51] feat: run again --- stacks-common/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd; From 4e39b1bbc0380bfc4c76e76f749de163fd20a1a7 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 20:08:21 +0200 Subject: [PATCH 49/51] feat: run again --- stacks-common/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index f759e9ca34..83e75f7e9a 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,6 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; +// test #[macro_use] extern crate lazy_static; extern crate ripemd; From 0a52e00b918042147b62e8b4cdc2f78a7fd62f38 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 20:48:17 +0200 Subject: [PATCH 50/51] feat: run again --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index 83e75f7e9a..ac23ef6a87 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; -// test +// test 2 #[macro_use] extern crate lazy_static; extern crate ripemd; From cd301b3571fd209218a927b6580a83aa881d0ef7 Mon Sep 17 00:00:00 2001 From: ASuciuX Date: Sun, 7 Jan 2024 21:36:08 +0200 Subject: [PATCH 51/51] feat: run again final modifications --- stacks-common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index ac23ef6a87..a53f7db984 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,7 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; -// test 2 + #[macro_use] extern crate lazy_static; extern crate ripemd;