From 6dd166d7d4dd6734498b52537ba05d6f08c26ede Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 5 Mar 2021 15:40:15 +1100
Subject: [PATCH] remove unused service_node.js and test for it
---
libloki/index.d.ts | 1 -
libloki/service_nodes.js | 42 ---------
libloki/test/index.html | 3 +-
libloki/test/service_nodes_test.js | 137 -----------------------------
4 files changed, 2 insertions(+), 181 deletions(-)
delete mode 100644 libloki/service_nodes.js
delete mode 100644 libloki/test/service_nodes_test.js
diff --git a/libloki/index.d.ts b/libloki/index.d.ts
index 82ad4d784..0a0c93e6a 100644
--- a/libloki/index.d.ts
+++ b/libloki/index.d.ts
@@ -4,5 +4,4 @@ export interface Libloki {
api: any;
crypto: CryptoInterface;
storage: any;
- serviceNodes: any;
}
diff --git a/libloki/service_nodes.js b/libloki/service_nodes.js
deleted file mode 100644
index a6bb793d1..000000000
--- a/libloki/service_nodes.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* global window */
-
-// eslint-disable-next-line func-names
-(function() {
- window.libloki = window.libloki || {};
-
- function consolidateLists(lists, threshold, selector = x => x) {
- if (typeof threshold !== 'number') {
- throw Error('Provided threshold is not a number');
- }
- if (typeof selector !== 'function') {
- throw Error('Provided selector is not a function');
- }
-
- // calculate list size manually since `Set`
- // does not have a `length` attribute
- let numLists = 0;
- const occurences = {};
- const values = {};
- lists.forEach(list => {
- numLists += 1;
- list.forEach(item => {
- const key = selector(item);
- if (!(key in occurences)) {
- occurences[key] = 1;
- values[key] = item;
- } else {
- occurences[key] += 1;
- }
- });
- });
-
- const scaledThreshold = numLists * threshold;
- return Object.keys(occurences)
- .filter(key => occurences[key] >= scaledThreshold)
- .map(key => values[key]);
- }
-
- window.libloki.serviceNodes = {
- consolidateLists,
- };
-})();
diff --git a/libloki/test/index.html b/libloki/test/index.html
index bd5b0ed61..9b7cd2cf8 100644
--- a/libloki/test/index.html
+++ b/libloki/test/index.html
@@ -39,4 +39,5 @@
mocha.run();
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/libloki/test/service_nodes_test.js b/libloki/test/service_nodes_test.js
deleted file mode 100644
index 546c3bd00..000000000
--- a/libloki/test/service_nodes_test.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/* global libloki, assert */
-
-describe('ServiceNodes', () => {
- describe('#consolidateLists', () => {
- it('should throw when provided a non-iterable list', () => {
- assert.throws(
- () => libloki.serviceNodes.consolidateLists(null, 1),
- Error
- );
- });
-
- it('should throw when provided a non-iterable item in the list', () => {
- assert.throws(
- () => libloki.serviceNodes.consolidateLists([1, 2, 3], 1),
- Error
- );
- });
-
- it('should throw when provided a non-number threshold', () => {
- assert.throws(
- () => libloki.serviceNodes.consolidateLists([], 'a'),
- 'Provided threshold is not a number'
- );
- });
-
- it('should throw when provided a non-function selector', () => {
- [1, 'a', 0xffffffff, { really: 'not a function' }].forEach(x => {
- assert.throws(
- () => libloki.serviceNodes.consolidateLists([], 1, x),
- 'Provided selector is not a function'
- );
- });
- });
-
- it('should return an empty array when the input is an empty array', () => {
- const result = libloki.serviceNodes.consolidateLists([], 1);
- assert.deepEqual(result, []);
- });
-
- it('should return the input when only 1 list is provided', () => {
- const result = libloki.serviceNodes.consolidateLists(
- [['a', 'b', 'c']],
- 1
- );
- assert.deepEqual(result, ['a', 'b', 'c']);
- });
-
- it('should return the union of all lists when threshold is 0', () => {
- const result = libloki.serviceNodes.consolidateLists(
- [
- ['a', 'b', 'c', 'h'],
- ['d', 'e', 'f', 'g'],
- ['g', 'h'],
- ],
- 0
- );
- assert.deepEqual(result.sort(), ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
- });
-
- it('should use the selector to identify the elements', () => {
- const result = libloki.serviceNodes.consolidateLists(
- [
- [
- { id: 1, val: 'a' },
- { id: 2, val: 'b' },
- { id: 3, val: 'c' },
- { id: 8, val: 'h' },
- ],
- [
- { id: 4, val: 'd' },
- { id: 5, val: 'e' },
- { id: 6, val: 'f' },
- { id: 7, val: 'g' },
- ],
- [
- { id: 7, val: 'g' },
- { id: 8, val: 'h' },
- ],
- ],
- 0,
- x => x.id
- );
- const expected = [
- { id: 1, val: 'a' },
- { id: 2, val: 'b' },
- { id: 3, val: 'c' },
- { id: 4, val: 'd' },
- { id: 5, val: 'e' },
- { id: 6, val: 'f' },
- { id: 7, val: 'g' },
- { id: 8, val: 'h' },
- ];
- assert.deepEqual(
- result.sort((a, b) => a.val > b.val),
- expected
- );
- });
-
- it('should return the intersection of all lists when threshold is 1', () => {
- const result = libloki.serviceNodes.consolidateLists(
- [
- ['a', 'b', 'c', 'd'],
- ['a', 'e', 'f', 'g'],
- ['a', 'h'],
- ],
- 1
- );
- assert.deepEqual(result, ['a']);
- });
-
- it('should return the elements that have an occurence >= the provided threshold', () => {
- const result = libloki.serviceNodes.consolidateLists(
- [
- ['a', 'b', 'c', 'd', 'e', 'f', 'g'],
- ['a', 'b', 'c', 'd', 'e', 'f', 'h'],
- ['a', 'b', 'c', 'd', 'e', 'f', 'g'],
- ['a', 'b', 'c', 'd', 'e', 'g', 'h'],
- ],
- 3 / 4
- );
- assert.deepEqual(result, ['a', 'b', 'c', 'd', 'e', 'f', 'g']);
- });
-
- it('should work with sets as well', () => {
- const result = libloki.serviceNodes.consolidateLists(
- new Set([
- new Set(['a', 'b', 'c', 'd', 'e', 'f', 'g']),
- new Set(['a', 'b', 'c', 'd', 'e', 'f', 'h']),
- new Set(['a', 'b', 'c', 'd', 'e', 'f', 'g']),
- new Set(['a', 'b', 'c', 'd', 'e', 'g', 'h']),
- ]),
- 3 / 4
- );
- assert.deepEqual(result, ['a', 'b', 'c', 'd', 'e', 'f', 'g']);
- });
- });
-});