Skip to content

Conversation

@marcinja
Copy link
Contributor

Moves a comment about the BaseIndex::DB from the TxIndex::DB into the correct place. Originally part of #14053.

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 68b597b81395e026e299bca05e46312f273f812b.

@jnewbery
Copy link
Contributor

ACK 68b597b81395e026e299bca05e46312f273f812b

Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 68b597b

@maflcko
Copy link
Member

maflcko commented Aug 17, 2020

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

@marcinja marcinja force-pushed the move-index-comment branch from c8463bd to 8ed2f1e Compare August 19, 2020 01:48
@DrahtBot
Copy link
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

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.

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 8ed2f1e

@fanquake fanquake merged commit 0d9e14a into bitcoin:master Aug 21, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 21, 2020
8ed2f1e Remove unused includes (Marcin Jachymiak)
cf095a5 Move comment about BaseIndex::DB from TxIndex::DB (Marcin Jachymiak)

Pull request description:

  Moves a comment about the `BaseIndex::DB` from the `TxIndex::DB` into the correct place. Originally part of bitcoin#14053.

ACKs for top commit:
  fanquake:
    ACK 8ed2f1e

Tree-SHA512: cb4e2b916c7ab996961cc2e1d910bc4b8a1700eb32b70fc1657ca720117a7a84f7337fe5e4fb30e047aa92c31eaa976eaaa5cb8f861877f2ff6f4a59bb94f4e9
vijaydasmp pushed a commit to vijaydasmp/dash that referenced this pull request Sep 15, 2021
8ed2f1e Remove unused includes (Marcin Jachymiak)
cf095a5 Move comment about BaseIndex::DB from TxIndex::DB (Marcin Jachymiak)

Pull request description:

  Moves a comment about the `BaseIndex::DB` from the `TxIndex::DB` into the correct place. Originally part of bitcoin#14053.

ACKs for top commit:
  fanquake:
    ACK 8ed2f1e

Tree-SHA512: cb4e2b916c7ab996961cc2e1d910bc4b8a1700eb32b70fc1657ca720117a7a84f7337fe5e4fb30e047aa92c31eaa976eaaa5cb8f861877f2ff6f4a59bb94f4e9
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 15, 2021
Summary:
And remove unused includes

This is a backport of [[bitcoin/bitcoin#19733 | core#19733]]

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D10119
vijaydasmp pushed a commit to vijaydasmp/dash that referenced this pull request Sep 22, 2021
8ed2f1e Remove unused includes (Marcin Jachymiak)
cf095a5 Move comment about BaseIndex::DB from TxIndex::DB (Marcin Jachymiak)

Pull request description:

  Moves a comment about the `BaseIndex::DB` from the `TxIndex::DB` into the correct place. Originally part of bitcoin#14053.

ACKs for top commit:
  fanquake:
    ACK 8ed2f1e

Tree-SHA512: cb4e2b916c7ab996961cc2e1d910bc4b8a1700eb32b70fc1657ca720117a7a84f7337fe5e4fb30e047aa92c31eaa976eaaa5cb8f861877f2ff6f4a59bb94f4e9
UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 24, 2021
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants