From f5a1c8a0656cae8e10cc745d06967863df233894 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Thu, 21 May 2020 13:57:25 -0400 Subject: [PATCH] cleanup --- src/app/onboarding/core.nim | 2 +- src/app/onboarding/view.nim | 2 +- src/constants/default_networks.json | 1 - src/constants/node_config.json | 83 ------------------- src/models/accounts.nim | 4 +- .../accounts}/constants.nim | 0 .../accounts}/signing_phrases.nim | 0 src/status/utils.nim | 2 +- 8 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 src/constants/default_networks.json delete mode 100644 src/constants/node_config.json rename src/{constants => status/accounts}/constants.nim (100%) rename src/{constants => status/accounts}/signing_phrases.nim (100%) diff --git a/src/app/onboarding/core.nim b/src/app/onboarding/core.nim index f768fcddac..4ef144c62a 100644 --- a/src/app/onboarding/core.nim +++ b/src/app/onboarding/core.nim @@ -5,7 +5,7 @@ import nimcrypto import ../../status/utils import ../../status/libstatus import ../../models/accounts as Models -import ../../constants/constants +# import ../../constants/constants import ../signals/types import uuids import eventemitter diff --git a/src/app/onboarding/view.nim b/src/app/onboarding/view.nim index 37d6156ad4..4f06729656 100644 --- a/src/app/onboarding/view.nim +++ b/src/app/onboarding/view.nim @@ -7,7 +7,7 @@ import nimcrypto import ../../status/utils import ../../status/libstatus import ../../models/accounts as Models -import ../../constants/constants +# import ../../constants/constants import uuids type diff --git a/src/constants/default_networks.json b/src/constants/default_networks.json deleted file mode 100644 index 8b13789179..0000000000 --- a/src/constants/default_networks.json +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/constants/node_config.json b/src/constants/node_config.json deleted file mode 100644 index d2a49c5116..0000000000 --- a/src/constants/node_config.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "BrowsersConfig": { - "Enabled": true - }, - "ClusterConfig": { - "BootNodes": [ - "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443", - "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443", - "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443", - "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443" - ], - "Enabled": true, - "Fleet": "eth.prod", - "RendezvousNodes": [ - "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU", - "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf", - "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR" - ], - "StaticNodes": [ - "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443", - "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443" - ], - "TrustedMailServers": [ - "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443", - "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443", - "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443", - "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443", - "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443", - "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443" - ] - }, - "DataDir": "./ethereum/mainnet", - "EnableNTPSync": true, - "KeyStoreDir": "./keystore", - "ListenAddr": ":30304", - "LogEnabled": true, - "LogFile": "geth.log", - "LogLevel": "INFO", - "MailserversConfig": { - "Enabled": true - }, - "Name": "StatusIM", - "NetworkId": 1, - "NoDiscovery": false, - "PermissionsConfig": { - "Enabled": true - }, - "Rendezvous": true, - "RequireTopics": { - "whisper": { - "Max": 2, - "Min": 2 - } - }, - "ShhextConfig": { - "BackupDisabledDataDir": "./", - "DataSyncEnabled": true, - "InstallationID": "aef27732-8d86-5039-a32e-bdbe094d8791", - "MailServerConfirmations": true, - "MaxMessageDeliveryAttempts": 6, - "PFSEnabled": true, - "VerifyENSContractAddress": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e", - "VerifyENSURL": "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a", - "VerifyTransactionChainID": 1, - "VerifyTransactionURL": "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" - }, - "StatusAccountsConfig": { - "Enabled": true - }, - "UpstreamConfig": { - "Enabled": true, - "URL": "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" - }, - "WakuConfig": { - "BloomFilterMode": null, - "Enabled": true, - "LightClient": true, - "MinimumPoW": 0.001 - }, - "WalletConfig": { - "Enabled": true - } -} diff --git a/src/models/accounts.nim b/src/models/accounts.nim index 08669c051a..14d6561eec 100644 --- a/src/models/accounts.nim +++ b/src/models/accounts.nim @@ -2,12 +2,10 @@ import json import eventemitter import ../status/libstatus import ../status/accounts as status_accounts -import ../constants/constants +import ../status/accounts/constants import ../status/utils import nimcrypto import ../status/utils -import ../status/libstatus -import ../constants/constants # import "../../status/core" as status import ../app/signals/types import uuids diff --git a/src/constants/constants.nim b/src/status/accounts/constants.nim similarity index 100% rename from src/constants/constants.nim rename to src/status/accounts/constants.nim diff --git a/src/constants/signing_phrases.nim b/src/status/accounts/signing_phrases.nim similarity index 100% rename from src/constants/signing_phrases.nim rename to src/status/accounts/signing_phrases.nim diff --git a/src/status/utils.nim b/src/status/utils.nim index 5b79ca19e1..4da4ccdf11 100644 --- a/src/status/utils.nim +++ b/src/status/utils.nim @@ -3,7 +3,7 @@ import types import random from times import getTime, toUnix, nanosecond import strutils -import ../constants/signing_phrases +import accounts/signing_phrases proc isWakuEnabled(): bool = true # TODO: