From 5176b18ef98f23b78bebaf82a9cbead3f7563115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sun, 20 Mar 2022 19:42:46 +0100
Subject: [PATCH] common: rename AHashIndexMap to AmortizedIndexMap

---
 aquatic_common/src/lib.rs          | 5 +++--
 aquatic_http/src/common.rs         | 6 +++---
 aquatic_udp/src/workers/request.rs | 6 +++---
 aquatic_udp/src/workers/socket.rs  | 6 +++---
 aquatic_ws/src/workers/request.rs  | 6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/aquatic_common/src/lib.rs b/aquatic_common/src/lib.rs
index 17c9f24..6995382 100644
--- a/aquatic_common/src/lib.rs
+++ b/aquatic_common/src/lib.rs
@@ -9,7 +9,8 @@ pub mod access_list;
 pub mod cpu_pinning;
 pub mod privileges;
 
-pub type AHashIndexMap<K, V> = indexmap_amortized::IndexMap<K, V, RandomState>;
+/// Amortized IndexMap using AHash hasher
+pub type AmortizedIndexMap<K, V> = indexmap_amortized::IndexMap<K, V, RandomState>;
 
 /// Peer or connection valid until this instant
 ///
@@ -38,7 +39,7 @@ impl ValidUntil {
 #[inline]
 pub fn extract_response_peers<K, V, R, F>(
     rng: &mut impl Rng,
-    peer_map: &AHashIndexMap<K, V>,
+    peer_map: &AmortizedIndexMap<K, V>,
     max_num_peers_to_take: usize,
     sender_peer_map_key: K,
     peer_conversion_function: F,
diff --git a/aquatic_http/src/common.rs b/aquatic_http/src/common.rs
index c925ad5..930f865 100644
--- a/aquatic_http/src/common.rs
+++ b/aquatic_http/src/common.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use aquatic_common::access_list::{create_access_list_cache, AccessListArcSwap, AccessListCache};
-use aquatic_common::{AHashIndexMap, CanonicalSocketAddr};
+use aquatic_common::{AmortizedIndexMap, CanonicalSocketAddr};
 use either::Either;
 use smartstring::{LazyCompact, SmartString};
 
@@ -140,7 +140,7 @@ pub struct PeerMapKey<I: Ip> {
     pub ip_or_key: Either<I, SmartString<LazyCompact>>,
 }
 
-pub type PeerMap<I> = AHashIndexMap<PeerMapKey<I>, Peer<I>>;
+pub type PeerMap<I> = AmortizedIndexMap<PeerMapKey<I>, Peer<I>>;
 
 pub struct TorrentData<I: Ip> {
     pub peers: PeerMap<I>,
@@ -159,7 +159,7 @@ impl<I: Ip> Default for TorrentData<I> {
     }
 }
 
-pub type TorrentMap<I> = AHashIndexMap<InfoHash, TorrentData<I>>;
+pub type TorrentMap<I> = AmortizedIndexMap<InfoHash, TorrentData<I>>;
 
 #[derive(Default)]
 pub struct TorrentMaps {
diff --git a/aquatic_udp/src/workers/request.rs b/aquatic_udp/src/workers/request.rs
index 4c013eb..447fab4 100644
--- a/aquatic_udp/src/workers/request.rs
+++ b/aquatic_udp/src/workers/request.rs
@@ -9,7 +9,7 @@ use std::time::Instant;
 
 use aquatic_common::access_list::create_access_list_cache;
 use aquatic_common::access_list::AccessListArcSwap;
-use aquatic_common::AHashIndexMap;
+use aquatic_common::AmortizedIndexMap;
 use aquatic_common::CanonicalSocketAddr;
 use aquatic_common::ValidUntil;
 use crossbeam_channel::Receiver;
@@ -39,7 +39,7 @@ impl<I: Ip> Peer<I> {
     }
 }
 
-type PeerMap<I> = AHashIndexMap<PeerId, Peer<I>>;
+type PeerMap<I> = AmortizedIndexMap<PeerId, Peer<I>>;
 
 struct TorrentData<I: Ip> {
     pub peers: PeerMap<I>,
@@ -57,7 +57,7 @@ impl<I: Ip> Default for TorrentData<I> {
     }
 }
 
-type TorrentMap<I> = AHashIndexMap<InfoHash, TorrentData<I>>;
+type TorrentMap<I> = AmortizedIndexMap<InfoHash, TorrentData<I>>;
 
 #[derive(Default)]
 struct TorrentMaps {
diff --git a/aquatic_udp/src/workers/socket.rs b/aquatic_udp/src/workers/socket.rs
index f06a32c..6bf3487 100644
--- a/aquatic_udp/src/workers/socket.rs
+++ b/aquatic_udp/src/workers/socket.rs
@@ -16,7 +16,7 @@ use slab::Slab;
 use aquatic_common::access_list::create_access_list_cache;
 use aquatic_common::access_list::AccessListCache;
 use aquatic_common::ValidUntil;
-use aquatic_common::{AHashIndexMap, CanonicalSocketAddr};
+use aquatic_common::{AmortizedIndexMap, CanonicalSocketAddr};
 use aquatic_udp_protocol::*;
 use socket2::{Domain, Protocol, Socket, Type};
 
@@ -24,7 +24,7 @@ use crate::common::*;
 use crate::config::Config;
 
 #[derive(Default)]
-pub struct ConnectionMap(AHashIndexMap<(ConnectionId, CanonicalSocketAddr), ValidUntil>);
+pub struct ConnectionMap(AmortizedIndexMap<(ConnectionId, CanonicalSocketAddr), ValidUntil>);
 
 impl ConnectionMap {
     pub fn insert(
@@ -66,7 +66,7 @@ impl PendingScrapeResponseSlab {
         request: ScrapeRequest,
         valid_until: ValidUntil,
     ) -> impl IntoIterator<Item = (RequestWorkerIndex, PendingScrapeRequest)> {
-        let mut split_requests: AHashIndexMap<RequestWorkerIndex, PendingScrapeRequest> =
+        let mut split_requests: AmortizedIndexMap<RequestWorkerIndex, PendingScrapeRequest> =
             Default::default();
 
         if request.info_hashes.is_empty() {
diff --git a/aquatic_ws/src/workers/request.rs b/aquatic_ws/src/workers/request.rs
index c9adc36..693ac7d 100644
--- a/aquatic_ws/src/workers/request.rs
+++ b/aquatic_ws/src/workers/request.rs
@@ -12,7 +12,7 @@ use glommio::timer::TimerActionRepeat;
 use hashbrown::HashMap;
 use rand::{rngs::SmallRng, SeedableRng};
 
-use aquatic_common::{extract_response_peers, AHashIndexMap};
+use aquatic_common::{extract_response_peers, AmortizedIndexMap};
 use aquatic_ws_protocol::*;
 
 use crate::common::*;
@@ -49,7 +49,7 @@ struct Peer {
     pub valid_until: ValidUntil,
 }
 
-type PeerMap = AHashIndexMap<PeerId, Peer>;
+type PeerMap = AmortizedIndexMap<PeerId, Peer>;
 
 struct TorrentData {
     pub peers: PeerMap,
@@ -68,7 +68,7 @@ impl Default for TorrentData {
     }
 }
 
-type TorrentMap = AHashIndexMap<InfoHash, TorrentData>;
+type TorrentMap = AmortizedIndexMap<InfoHash, TorrentData>;
 
 #[derive(Default)]
 struct TorrentMaps {