-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
Expose remaining v17
blockchain
APIs for v19
+
#79
Expose remaining v17
blockchain
APIs for v19
+
#79
Conversation
495d61c
to
49c2f5b
Compare
v17
blockchain
APIs for v19
+v17
blockchain
APIs for v19
+
3e7146e
to
cda323a
Compare
v17
blockchain
APIs for v19
+v17
blockchain
APIs for v19
+
v17
blockchain
APIs for v19
+v17
blockchain
APIs for v19
+
2b11188
to
d8c03c1
Compare
Bro this is sick!!! Thanks a million for the PR man, super cool. To review it I squashed the whole thing down and then rebase #49 on top of it - and it has green CI. Epic. Let me know how you want to proceed. A few comments.
|
Ah, true, although somewhat preexisting as
Good to know, now added a fixup to switch to that. > git diff-tree -U2 d8c03c1 54c2ddd
diff --git a/integration_test/tests/blockchain.rs b/integration_test/tests/blockchain.rs
index 4f05c34..1666f06 100644
--- a/integration_test/tests/blockchain.rs
+++ b/integration_test/tests/blockchain.rs
@@ -71,5 +71,5 @@ fn get_block_header_verbose() { // verbose = true
}
-#[cfg(all(not(feature = "0_18_1"), not(feature = "0_19_1"), not(feature = "0_19_1"), not(feature = "0_20_2"), not(feature = "0_21_2"), not(feature = "22_1"), not(feature = "23_2"), not(feature = "24_2")))]
+#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
@@ -81,5 +81,5 @@ fn get_block_stats() {
}
-#[cfg(all(not(feature = "0_18_1"), not(feature = "0_19_1"), not(feature = "0_19_1"), not(feature = "0_20_2"), not(feature = "0_21_2"), not(feature = "22_1"), not(feature = "23_2"), not(feature = "24_2")))]
+#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
@@ -91,5 +91,5 @@ fn get_block_stats_by_height() {
}
-#[cfg(all(not(feature = "0_18_1"), not(feature = "0_19_1"), not(feature = "0_19_1"), not(feature = "0_20_2"), not(feature = "0_21_2"), not(feature = "22_1"), not(feature = "23_2"), not(feature = "24_2")))]
+#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
@@ -102,5 +102,5 @@ fn get_block_stats_by_hash() { // verbose = true
}
-#[cfg(all(not(feature = "0_18_1"), not(feature = "0_19_1"), not(feature = "0_19_1"), not(feature = "0_20_2"), not(feature = "0_21_2"), not(feature = "22_1"), not(feature = "23_2"), not(feature = "24_2")))]
+#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
@@ -113,5 +113,5 @@ fn get_block_stats_by_height_txindex() {
}
-#[cfg(all(not(feature = "0_18_1"), not(feature = "0_19_1"), not(feature = "0_19_1"), not(feature = "0_20_2"), not(feature = "0_21_2"), not(feature = "22_1"), not(feature = "23_2"), not(feature = "24_2")))]
+#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
diff --git a/types/src/v19/blockchain.rs b/types/src/v19/blockchain.rs
index d956ded..fe6f961 100644
--- a/types/src/v19/blockchain.rs
+++ b/types/src/v19/blockchain.rs
@@ -345,5 +345,5 @@ pub struct MempoolEntry {
/// Hash of serialized transaction, including witness data.
pub wtxid: String,
- /// (No docs in Core v17.)
+ /// (No docs in Core v19.)
pub fees: MempoolEntryFees,
/// Unconfirmed transactions used as inputs for this transaction (parent transaction id).
@@ -399,5 +399,5 @@ impl MempoolEntry {
}
-/// (No docs in Core v17.)
+/// (No docs in Core v19.)
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct MempoolEntryFees { |
d8c03c1
to
54c2ddd
Compare
Failing nightly formatting CI job seems unrelated as I'm not touching the parts it's failing on in this PR. |
54c2ddd
to
394d2e5
Compare
Pushed another fixup allowing to test the > git diff-tree -U2 54c2ddd 394d2e5
diff --git a/integration_test/tests/blockchain.rs b/integration_test/tests/blockchain.rs
index 1666f06..87ce52d 100644
--- a/integration_test/tests/blockchain.rs
+++ b/integration_test/tests/blockchain.rs
@@ -102,5 +102,5 @@ fn get_block_stats_by_hash() { // verbose = true
}
-#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
+#[cfg(not(any(feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
@@ -113,5 +113,5 @@ fn get_block_stats_by_height_txindex() {
}
-#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
+#[cfg(not(any(feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions |
Let me know if I can squash the fixups! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 394d2e5
All looks good, squash away! |
I"ll merge #81 so you can rebase on top and get past the formatting job in CI. |
394d2e5
to
f001c7a
Compare
.. and feature gate the individual test cases, allowing more fine-grained control going forward.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
.. as it was previously only available in `v17` and `v18`.
f001c7a
to
2efcb9e
Compare
Rebased on |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 2efcb9e
v18 is excluded from the |
Well, yes, it's excluded for the non- |
Oh no worries. I had it in mind that we would enable |
While these API methods were previously exposed for a
v17
client, they were not forv19
+.Here, we add the
blockchain
APIs present inv17
forv19
+.