remove ip_url from seed nodes as this is unused

pull/1839/head
audric 4 years ago
parent 215f2227c1
commit 1ffadad2ad

@ -5,15 +5,12 @@
"contentProxyUrl": "", "contentProxyUrl": "",
"seedNodeList": [ "seedNodeList": [
{ {
"ip_url": "https://116.203.53.213:4433/",
"url": "https://storage.seed1.loki.network:4433/" "url": "https://storage.seed1.loki.network:4433/"
}, },
{ {
"ip_url": "https://212.199.114.66:4433/",
"url": "https://storage.seed3.loki.network:4433/" "url": "https://storage.seed3.loki.network:4433/"
}, },
{ {
"ip_url": "https://144.76.164.202:4433/",
"url": "https://public.loki.foundation:4433/" "url": "https://public.loki.foundation:4433/"
} }
], ],
@ -22,7 +19,5 @@
"buildExpiration": 0, "buildExpiration": 0,
"commitHash": "", "commitHash": "",
"import": false, "import": false,
"serverTrustRoot": "BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx", "serverTrustRoot": "BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx"
"defaultPublicChatServer": "https://chat.getsession.org",
"defaultFileServer": "https://file.getsession.org"
} }

@ -1,8 +1,7 @@
{ {
"seedNodeList": [ "seedNodeList": [
{ {
"url": "http://public.loki.foundation:38157/", "url": "http://public.loki.foundation:38157/"
"ip_url": "http://144.76.164.202:38157/"
} }
], ],
"openDevTools": true "openDevTools": true

@ -1,10 +1,8 @@
{ {
"seedNodeList": [ "seedNodeList": [
{ {
"ip_url": "http://127.0.0.1:22129/",
"url": "http://localhost:22129/" "url": "http://localhost:22129/"
} }
], ],
"openDevTools": true, "openDevTools": true
"defaultFileServer": "https://file-dev.getsession.org"
} }

@ -169,7 +169,6 @@ function prepareURL(pathSegments, moreKeys) {
contentProxyUrl: config.contentProxyUrl, contentProxyUrl: config.contentProxyUrl,
serverTrustRoot: config.get('serverTrustRoot'), serverTrustRoot: config.get('serverTrustRoot'),
appStartInitialSpellcheckSetting, appStartInitialSpellcheckSetting,
defaultFileServer: config.get('defaultFileServer'),
...moreKeys, ...moreKeys,
}, },
}); });

@ -48,8 +48,6 @@ window.isBehindProxy = () => Boolean(config.proxyUrl);
window.getStoragePubKey = key => (window.isDev() ? key.substring(2) : key); window.getStoragePubKey = key => (window.isDev() ? key.substring(2) : key);
window.getDefaultFileServer = () => config.defaultFileServer;
window.lokiFeatureFlags = { window.lokiFeatureFlags = {
useOnionRequests: true, useOnionRequests: true,
useFileOnionRequests: true, useFileOnionRequests: true,
@ -60,8 +58,6 @@ window.lokiFeatureFlags = {
if (typeof process.env.NODE_ENV === 'string' && process.env.NODE_ENV.includes('test-integration')) { if (typeof process.env.NODE_ENV === 'string' && process.env.NODE_ENV.includes('test-integration')) {
window.electronRequire = require; window.electronRequire = require;
// during test-integration, file server is started on localhost
window.getDefaultFileServer = () => 'http://127.0.0.1:7070';
} }
window.isBeforeVersion = (toCheck, baseVersion) => { window.isBeforeVersion = (toCheck, baseVersion) => {

@ -38,7 +38,6 @@ const swarmCache: Map<string, Array<string>> = new Map();
export type SeedNode = { export type SeedNode = {
url: string; url: string;
ip_url: string;
}; };
// just get the filtered list // just get the filtered list
@ -68,7 +67,7 @@ async function tryGetSnodeListFromLokidSeednode(
// throw before clearing the lock, so the retries can kick in // throw before clearing the lock, so the retries can kick in
if (snodes.length === 0) { if (snodes.length === 0) {
window?.log?.warn( window?.log?.warn(
`loki_snode_api::tryGetSnodeListFromLokidSeednode - ${seedNode.ip_url} did not return any snodes` `loki_snode_api::tryGetSnodeListFromLokidSeednode - ${seedNode.url} did not return any snodes`
); );
// does this error message need to be exactly this? // does this error message need to be exactly this?
throw new window.textsecure.SeedNodeError('Failed to contact seed node'); throw new window.textsecure.SeedNodeError('Failed to contact seed node');

Loading…
Cancel
Save