Merge pull request #151 from solidstate-network/EnumerableMapTests

Update and test `EnumerableMap`

Author: ItsNickBarry

contracts/data/EnumerableMap.sol

@@ -35,11 +35,11 @@ library EnumerableMap {
         returns (address, address)
     {
         (bytes32 key, bytes32 value) = _at(map._inner, index);
-        address addressKey;
-        assembly {
-            addressKey := mload(add(key, 20))
-        }
-        return (addressKey, address(uint160(uint256(value))));
+
+        return (
+            address(uint160(uint256(key))),
+            address(uint160(uint256(value)))
+        );
     }
 
     function at(UintToAddressMap storage map, uint256 index)
@@ -139,6 +139,108 @@ library EnumerableMap {
         return _remove(map._inner, bytes32(key));
     }
 
+    function toArray(AddressToAddressMap storage map)
+        internal
+        view
+        returns (address[] memory keys, address[] memory values)
+    {
+        uint256 len = map._inner._entries.length;
+        keys = new address[](len);
+        values = new address[](len);
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                keys[i] = address(
+                    uint160(uint256(map._inner._entries[i]._key))
+                );
+                values[i] = address(
+                    uint160(uint256(map._inner._entries[i]._value))
+                );
+            }
+        }
+    }
+
+    function toArray(UintToAddressMap storage map)
+        internal
+        view
+        returns (uint256[] memory keys, address[] memory values)
+    {
+        uint256 len = map._inner._entries.length;
+        keys = new uint256[](len);
+        values = new address[](len);
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                keys[i] = uint256(map._inner._entries[i]._key);
+                values[i] = address(
+                    uint160(uint256(map._inner._entries[i]._value))
+                );
+            }
+        }
+    }
+
+    function keys(AddressToAddressMap storage map)
+        internal
+        view
+        returns (address[] memory keys)
+    {
+        uint256 len = map._inner._entries.length;
+        keys = new address[](len);
+
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                keys[i] = address(
+                    uint160(uint256(map._inner._entries[i]._key))
+                );
+            }
+        }
+    }
+
+    function keys(UintToAddressMap storage map)
+        internal
+        view
+        returns (uint256[] memory keys)
+    {
+        uint256 len = map._inner._entries.length;
+        keys = new uint256[](len);
+
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                keys[i] = uint256(map._inner._entries[i]._key);
+            }
+        }
+    }
+
+    function values(AddressToAddressMap storage map)
+        internal
+        view
+        returns (address[] memory values)
+    {
+        uint256 len = map._inner._entries.length;
+        values = new address[](len);
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                values[i] = address(
+                    uint160(uint256(map._inner._entries[i]._value))
+                );
+            }
+        }
+    }
+
+    function values(UintToAddressMap storage map)
+        internal
+        view
+        returns (address[] memory values)
+    {
+        uint256 len = map._inner._entries.length;
+        values = new address[](len);
+        unchecked {
+            for (uint256 i; i < len; ++i) {
+                values[i] = address(
+                    uint160(uint256(map._inner._entries[i]._value))
+                );
+            }
+        }
+    }
+
     function _at(Map storage map, uint256 index)
         private
         view

contracts/data/EnumerableMapAddressToAddressMock.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.8;
+
+import { EnumerableMap } from './EnumerableMap.sol';
+
+contract EnumerableMapAddressToAddressMock {
+    using EnumerableMap for EnumerableMap.AddressToAddressMap;
+
+    EnumerableMap.AddressToAddressMap internal map;
+
+    function at(uint256 index) external view returns (address, address) {
+        return map.at(index);
+    }
+
+    function contains(address key) external view returns (bool) {
+        return map.contains(key);
+    }
+
+    function length() external view returns (uint256) {
+        return map.length();
+    }
+
+    function get(address key) external view returns (address) {
+        return map.get(key);
+    }
+
+    function set(address key, address value) external returns (bool) {
+        return map.set(key, value);
+    }
+
+    function remove(address key) external returns (bool) {
+        return map.remove(key);
+    }
+
+    function toArray()
+        external
+        view
+        returns (address[] memory keys, address[] memory values)
+    {
+        (keys, values) = map.toArray();
+    }
+
+    function keys() external view returns (address[] memory keys) {
+        keys = map.keys();
+    }
+
+    function values() external view returns (address[] memory values) {
+        values = map.values();
+    }
+}

contracts/data/EnumerableMapUintToAddressMock.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.8;
+
+import { EnumerableMap } from './EnumerableMap.sol';
+
+contract EnumerableMapUintToAddressMock {
+    using EnumerableMap for EnumerableMap.UintToAddressMap;
+
+    EnumerableMap.UintToAddressMap internal map;
+
+    function at(uint256 index) external view returns (uint256, address) {
+        return map.at(index);
+    }
+
+    function contains(uint256 key) external view returns (bool) {
+        return map.contains(key);
+    }
+
+    function length() external view returns (uint256) {
+        return map.length();
+    }
+
+    function get(uint256 key) external view returns (address) {
+        return map.get(key);
+    }
+
+    function set(uint256 key, address value) external returns (bool) {
+        return map.set(key, value);
+    }
+
+    function remove(uint256 key) external returns (bool) {
+        return map.remove(key);
+    }
+
+    function toArray()
+        external
+        view
+        returns (uint256[] memory keys, address[] memory values)
+    {
+        (keys, values) = map.toArray();
+    }
+
+    function keys() external view returns (uint256[] memory keys) {
+        keys = map.keys();
+    }
+
+    function values() external view returns (address[] memory values) {
+        values = map.values();
+    }
+}