Moves a comment about the BaseIndex::DB from the TxIndex::DB into the correct place. Originally part of #14053.
Move comment about BaseIndex::DB from TxIndex::DB #19733
pull marcinja wants to merge 2 commits into bitcoin:master from marcinja:move-index-comment changing 3 files +11 −12-
marcinja commented at 10:21 PM on August 15, 2020: contributor
- DrahtBot added the label UTXO Db and Indexes on Aug 16, 2020
-
promag commented at 11:30 PM on August 16, 2020: member
ACK 68b597b81395e026e299bca05e46312f273f812b.
-
jnewbery commented at 9:59 AM on August 17, 2020: member
ACK 68b597b81395e026e299bca05e46312f273f812b
-
jonatack commented at 10:26 AM on August 17, 2020: member
ACK 68b597b
-
MarcoFalke commented at 11:05 AM on August 17, 2020: member
Needs rebase, and I see your previous commit had some apparent unused includes. If you agree, you can add a commit here to remove them:
diff --git a/src/index/disktxpos.h b/src/index/disktxpos.h index 8cd2270028..129f9dc7c0 100644 --- a/src/index/disktxpos.h +++ b/src/index/disktxpos.h @@ -5,10 +5,8 @@ #ifndef BITCOIN_INDEX_DISKTXPOS_H #define BITCOIN_INDEX_DISKTXPOS_H -#include <chain.h> #include <flatfile.h> -#include <primitives/block.h> -#include <primitives/transaction.h> +#include <serialize.h> struct CDiskTxPos : public FlatFilePos { @@ -33,5 +31,4 @@ struct CDiskTxPos : public FlatFilePos } }; - #endif // BITCOIN_INDEX_DISKTXPOS_H - MarcoFalke added the label Needs rebase on Aug 17, 2020
- marcinja force-pushed on Aug 17, 2020
- DrahtBot removed the label Needs rebase on Aug 17, 2020
-
Move comment about BaseIndex::DB from TxIndex::DB cf095a53fc
-
Remove unused includes 8ed2f1ed78
- marcinja force-pushed on Aug 19, 2020
-
DrahtBot commented at 8:17 PM on August 20, 2020: member
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #14053 (Add address-based index (attempt 4?) by marcinja)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
- fanquake approved
-
fanquake commented at 4:48 AM on August 21, 2020: member
ACK 8ed2f1ed78937eff0bb8b5318a30da908e33af24
- fanquake merged this on Aug 21, 2020
- fanquake closed this on Aug 21, 2020
- sidhujag referenced this in commit e954a012af on Aug 21, 2020
- vijaydasmp referenced this in commit 909c5fa563 on Sep 15, 2021
- deadalnix referenced this in commit bcb68a351d on Sep 15, 2021
- vijaydasmp referenced this in commit f3165ddc45 on Sep 16, 2021
- PastaPastaPasta referenced this in commit 4526efc6ac on Sep 17, 2021
- vijaydasmp referenced this in commit a97683ff3a on Sep 20, 2021
- vijaydasmp referenced this in commit 71df8f25db on Sep 20, 2021
- vijaydasmp referenced this in commit 829aeff0f6 on Sep 22, 2021
- UdjinM6 referenced this in commit da26b9bff8 on Sep 24, 2021
- kittywhiskers referenced this in commit c1d2c79f4d on Oct 12, 2021
- MarcoFalke locked this on Feb 15, 2022
