net: use m_client_interface rather than uiInterface #22732

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:use_uiinterface_in_net changing 2 files +19 −14

fanquake commented at 5:48 AM on August 18, 2021: member

First commit fixes two cases where we were using uiInterface, rather than clientInterface. Second commit renames clientInterface to m_client_interface, to match banman.
net: use clientInterface rather than uiInterface f68c6cebe6

scripted-diff: replace clientInterface with m_client_interface in net

-BEGIN VERIFY SCRIPT-

sed -i -e "s/clientInterface/m_client_interface/g" src/net.cpp src/net.h

-END VERIFY SCRIPT-

d8ba6327b2

in src/net.cpp:1307 in e378c66fcc outdated

1303 | @@ -1304,8 +1304,8 @@ void CConnman::NotifyNumConnectionsChanged()
1304 |      }
1305 |      if(vNodesSize != nPrevNodeCount) {
1306 |          nPrevNodeCount = vNodesSize;
1307 | -        if(clientInterface)
1308 | -            clientInterface->NotifyNumConnectionsChanged(vNodesSize);
1309 | +        if(m_client_interface)

MarcoFalke commented at 5:51 AM on August 18, 2021:

        if (m_client_interface) {

fanquake commented at 5:55 AM on August 18, 2021:

Done.

fanquake force-pushed on Aug 18, 2021
DrahtBot added the label P2P on Aug 18, 2021
hebasto approved
hebasto commented at 7:01 AM on August 18, 2021: member

ACK d8ba6327b21c755582ab3c83fc31bc6c523c41c3, verified that uiInterface is replaced in all sites.
Zero-1729 commented at 7:18 AM on August 18, 2021: contributor

crACK d8ba6327b21c755582ab3c83fc31bc6c523c41c3
fanquake merged this on Aug 18, 2021
fanquake closed this on Aug 18, 2021
fanquake deleted the branch on Aug 18, 2021
sidhujag referenced this in commit f621dfd501 on Aug 20, 2021
DrahtBot locked this on Aug 18, 2022

Contributors

Labels