GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bitcoin/bitcoin#25814: net: simplify GetLocalAddress()

Browse source 
daabd41211 net: simplify GetLocalAddress() (Vasil Dimov)

Pull request description:

  There is no need to use two variables `ret` and `addr` of the same type
  `CService` and assign one to the other in a strange way like
  `ret = CService{addr}`.

ACKs for top commit:
  jarolrod:
    ACK daabd41211
  aureleoules:
    ACK daabd41211.
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25814/commits/daabd4121114fe6f780bccab311a522c0717c5b8

Tree-SHA512: 4bbd3746bc30fbc05bb32b58bb122c938acd849c0f72f1d3e8170557c1999ec26a888e06e874c3fc22562a2becddc7d817db7d174e0e1b383e8d74c39aa1e898
This commit is contained in:
MacroFake 2022-08-12 10:52:31 +02:00
commit 89b2194124
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/net.cpp
View file

@ -208,12 +208,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
// one by discovery.
CService GetLocalAddress(const CNetAddr& addrPeer)
{
CService ret{CNetAddr(), GetListenPort()};
CService addr;
if (GetLocal(addr, &addrPeer)) {
ret = CService{addr};
return addr;
}
return ret;
return CService{CNetAddr(), GetListenPort()};
}
static int GetnScore(const CService& addr)