Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jeandemeusy committed Jan 29, 2024
1 parent bfe28a4 commit 8c59533
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
2 changes: 2 additions & 0 deletions ct-app/core/components/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def mergeTopologyPeersSubgraph(
merged_result: list[Peer] = []

network_addresses = [p.address for p in peers_list]
peer_versions = {p.address: p.version for p in peers_list}

# Merge based on peer ID with the channel topology as the baseline
for topology_entry in topology_list:
Expand All @@ -121,6 +122,7 @@ def mergeTopologyPeersSubgraph(
peer.safe_allowance = None

if peer.complete and peer.address in network_addresses:
peer.version = peer_versions[peer.address]
merged_result.append(peer)

return merged_result
Expand Down
2 changes: 1 addition & 1 deletion ct-app/core/model/topology_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ def __repr__(self):
)

def to_peer(self) -> Peer:
peer = Peer(self.peer_id, self.node_address, "v0.0.0")
peer = Peer(self.peer_id, self.node_address, "0.0.0")
peer.channel_balance = self.channels_balance
return peer
40 changes: 22 additions & 18 deletions ct-app/test/model/test_peer.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,30 @@
def test_peer_version():
peer = Peer("some_id", "some_address", "0.0.1")

peer.version = "v0.1.0-rc.1"
assert peer.version_is_old("v0.1.0-rc.2")
assert peer.version_is_old(Version("v0.1.0-rc.2"))
peer.version = "0.1.0-rc.1"
assert peer.version_is_old("0.1.0-rc.2")
assert peer.version_is_old(Version("0.1.0-rc.2"))

peer.version = "v0.1.0-rc.1"
assert not peer.version_is_old("v0.1.0-rc.0")
assert not peer.version_is_old(Version("v0.1.0-rc.0"))
peer.version = "0.1.0-rc.1"
assert not peer.version_is_old("0.1.0-rc.0")
assert not peer.version_is_old(Version("0.1.0-rc.0"))

peer.version = "v0.1.1"
assert not peer.version_is_old("v0.1.0-rc.3")
assert not peer.version_is_old(Version("v0.1.0-rc.3"))
peer.version = "0.1.1"
assert not peer.version_is_old("0.1.0-rc.3")
assert not peer.version_is_old(Version("0.1.0-rc.3"))

peer.version = "v0.1.0-rc.1"
assert not peer.version_is_old("v0.1.0-rc.1")
assert not peer.version_is_old(Version("v0.1.0-rc.1"))
peer.version = "0.1.0-rc.1"
assert not peer.version_is_old("0.1.0-rc.1")
assert not peer.version_is_old(Version("0.1.0-rc.1"))

peer.version = "v2.0"
assert not peer.version_is_old("v2.0")
assert not peer.version_is_old(Version("v2.0"))
peer.version = "2.0"
assert not peer.version_is_old("2.0")
assert not peer.version_is_old(Version("2.0"))

peer.version = "v2.0"
assert peer.version_is_old("v2.1")
assert peer.version_is_old(Version("v2.1"))
peer.version = "2.0"
assert peer.version_is_old("2.1")
assert peer.version_is_old(Version("2.1"))

peer.version = "2.0.7"
assert not peer.version_is_old("2.0.7")
assert not peer.version_is_old(Version("2.0.7"))

0 comments on commit 8c59533

Please sign in to comment.