From 14c8e66f607e6f9e211055d2587c9fab00945503 Mon Sep 17 00:00:00 2001 From: Pavel Patsey Date: Sun, 26 Jan 2025 11:07:41 +0300 Subject: [PATCH] remove unnecessary function --- vpn_manager/cidr4_merge/cidr4_merger.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/vpn_manager/cidr4_merge/cidr4_merger.py b/vpn_manager/cidr4_merge/cidr4_merger.py index 5c7fc02..b551ff8 100644 --- a/vpn_manager/cidr4_merge/cidr4_merger.py +++ b/vpn_manager/cidr4_merge/cidr4_merger.py @@ -48,18 +48,15 @@ def merge_nodes(a: Node, b: Node) -> tuple[Node, int]: mask = (mask << 1) & ((1 << 32) - 1) return ia & mask, min_l - def calc_dip(la, lb, lp): - def dip(l1, lp): - m = lp + 1 - res = 1 << (l1 - m) - res -= 1 - res <<= 32 - l1 - return res - - return dip(la, lp) + dip(lb, lp) + def calc_dip(l1, lp): + m = lp + 1 + res = 1 << (l1 - m) + res -= 1 + res <<= 32 - l1 + return res p = find_parent(a, b) - dip = calc_dip(a[1], b[1], p[1]) + dip = calc_dip(a[1], p[1]) + calc_dip(b[1], p[1]) return p, dip