From c791022e943e50d9bb0cb5604401110d47f66843 Mon Sep 17 00:00:00 2001 From: ligi Date: Thu, 4 Aug 2022 01:46:03 +0200 Subject: [PATCH] Normalize names and shortNames --- _data/chains/eip155-1246.json | 4 ++-- _data/chains/eip155-55555.json | 2 +- _data/chains/eip155-64.json | 2 +- .../kotlin/org/ethereum/lists/chains/Main.kt | 18 +++++++++++------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_data/chains/eip155-1246.json b/_data/chains/eip155-1246.json index 2df135e4..e76d9d4f 100644 --- a/_data/chains/eip155-1246.json +++ b/_data/chains/eip155-1246.json @@ -1,6 +1,6 @@ { - "name": "OM Chain Mainnet", - "chain": "omchain", + "name": "OM Platform Mainnet", + "chain": "omplatform", "network": "mainnet", "rpc": [ "https://rpc-cnx.omplatform.com/" diff --git a/_data/chains/eip155-55555.json b/_data/chains/eip155-55555.json index 250f0a0c..8813d1e8 100644 --- a/_data/chains/eip155-55555.json +++ b/_data/chains/eip155-55555.json @@ -14,7 +14,7 @@ "decimals": 18 }, "infoURL": "https://reichain.io", - "shortName": "rei", + "shortName": "reichain", "chainId": 55555, "networkId": 55555, "explorers": [{ diff --git a/_data/chains/eip155-64.json b/_data/chains/eip155-64.json index 66165daa..0a493c1d 100644 --- a/_data/chains/eip155-64.json +++ b/_data/chains/eip155-64.json @@ -11,7 +11,7 @@ "decimals": 18 }, "infoURL": "https://ellaism.org", - "shortName": "ella", + "shortName": "ellaism", "chainId": 64, "networkId": 64, "slip44": 163 diff --git a/processor/src/main/kotlin/org/ethereum/lists/chains/Main.kt b/processor/src/main/kotlin/org/ethereum/lists/chains/Main.kt index ca765b57..a7cefa2e 100644 --- a/processor/src/main/kotlin/org/ethereum/lists/chains/Main.kt +++ b/processor/src/main/kotlin/org/ethereum/lists/chains/Main.kt @@ -329,26 +329,30 @@ fun checkChain(chainFile: File, connectRPC: Boolean) { } } +fun String.normalizeName() = replace(" ","").uppercase() + /* moshi fails for extra commas https://github.com/ethereum-lists/chains/issues/126 */ private fun parseWithMoshi(fileToParse: File) { val parsedChain = chainAdapter.fromJson(fileToParse.readText()) - if (parsedNames.contains(parsedChain!!.name)) { - throw NameMustBeUnique(parsedChain.name) + val parsedChainNormalizedName = parsedChain!!.name.normalizeName() + if (parsedNames.contains(parsedChainNormalizedName)) { + throw NameMustBeUnique(parsedChainNormalizedName) } - parsedNames.add(parsedChain.name) + parsedNames.add(parsedChainNormalizedName) - if (parsedShortNames.contains(parsedChain.shortName)) { - throw ShortNameMustBeUnique(parsedChain.shortName) + val parsedChainNormalizedShortName = parsedChain.shortName.normalizeName() + if (parsedShortNames.contains(parsedChainNormalizedShortName)) { + throw ShortNameMustBeUnique(parsedChainNormalizedShortName) } - if (parsedChain.shortName == "*") { + if (parsedChainNormalizedShortName == "*") { throw ShortNameMustNotBeStar() } - parsedShortNames.add(parsedChain.shortName) + parsedShortNames.add(parsedChainNormalizedShortName) } private fun getNumber(jsonObject: JsonObject, field: String): Long {