Refactor fRelayTxes global to CConnman member #10915

pull benma wants to merge 1 commits into bitcoin:master from benma:fRelayTxes changing 5 files +13 −7

benma commented at 7:35 PM on July 23, 2017: none

No description provided.
benma force-pushed on Jul 23, 2017
dcousens approved
in src/net.h:133 in 6bfe6c4ec7 outdated
```
 129 | @@ -130,6 +130,7 @@ class CConnman
 130 |  
 131 |      struct Options
 132 |      {
 133 | +        bool m_relay_txes = false;
```
promag commented at 11:39 PM on July 23, 2017:

Why the different initial value?

benma commented at 5:38 AM on July 24, 2017:

Mostly because of this: #10596 (review)

Personally, I also slightly prefer to put the correct default here, but it does not matter much as it gets overwritten anyway.
in src/net.h:355 in 6bfe6c4ec7 outdated
```
 353 | @@ -351,6 +354,7 @@ class CConnman
 354 |      unsigned int nSendBufferMaxSize;
 355 |      unsigned int nReceiveFloodSize;
 356 |  
 357 | +    bool m_relay_txes;
```
promag commented at 11:44 PM on July 23, 2017:

Missing initial value?

benma commented at 5:38 AM on July 24, 2017:

Is it needed? It gets set during Start() and isn't used before. Or is it a matter of good form?

promag commented at 11:36 PM on July 24, 2017:

Some future refactor can call GetRelayTxes (or other) before Start() and there is no way to know/prevent that.

benma commented at 7:07 AM on July 25, 2017:

Good point. Done.
promag commented at 11:45 PM on July 23, 2017: member

Suggestion, rename PR and commit to Refactor fRelayTxes global to CConnman member
fanquake added the label Refactoring on Jul 24, 2017
benma commented at 5:39 AM on July 24, 2017: none

@promag thx for the review. I rewrote the commit msg as you suggested.
benma force-pushed on Jul 24, 2017
benma renamed this:
~~get rid of the fRelayTxes global~~
Refactor fRelayTxes global to CConnman member
on Jul 24, 2017
jonasschnelli added the label P2P on Jul 24, 2017
jonasschnelli assigned theuni on Jul 24, 2017
promag commented at 11:37 PM on July 24, 2017: member

utACK 9c830bf.
benma force-pushed on Jul 25, 2017
benma commented at 10:36 PM on August 3, 2017: none

ping @theuni
Refactor fRelayTxes global to CConnman member 0b51af6b28
benma force-pushed on Aug 3, 2017
benma commented at 10:39 PM on August 3, 2017: none

Rebased.
theuni commented at 10:51 PM on August 3, 2017: member

Err.. I'd rather not, as this really needs to be a member of the message processor instead. We'll likely start moving in that direction after #10756 goes in. @TheBlueMatt agreed?
TheBlueMatt commented at 10:56 PM on August 3, 2017: member

Yea, we should be moving fRelayTxes towards net_processing, not net, sorry for the churn in this area.
benma closed this on Sep 11, 2017
DrahtBot locked this on Sep 8, 2021

Contributors

Labels