Normalize names and shortNames

This commit is contained in:
ligi 2022-08-04 01:46:03 +02:00
parent 753a6225e2
commit c791022e94
No known key found for this signature in database
GPG Key ID: 8E81894010ABF23D
4 changed files with 15 additions and 11 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "OM Chain Mainnet", "name": "OM Platform Mainnet",
"chain": "omchain", "chain": "omplatform",
"network": "mainnet", "network": "mainnet",
"rpc": [ "rpc": [
"https://rpc-cnx.omplatform.com/" "https://rpc-cnx.omplatform.com/"

View File

@ -14,7 +14,7 @@
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://reichain.io", "infoURL": "https://reichain.io",
"shortName": "rei", "shortName": "reichain",
"chainId": 55555, "chainId": 55555,
"networkId": 55555, "networkId": 55555,
"explorers": [{ "explorers": [{

View File

@ -11,7 +11,7 @@
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://ellaism.org", "infoURL": "https://ellaism.org",
"shortName": "ella", "shortName": "ellaism",
"chainId": 64, "chainId": 64,
"networkId": 64, "networkId": 64,
"slip44": 163 "slip44": 163

View File

@ -329,26 +329,30 @@ fun checkChain(chainFile: File, connectRPC: Boolean) {
} }
} }
fun String.normalizeName() = replace(" ","").uppercase()
/* /*
moshi fails for extra commas moshi fails for extra commas
https://github.com/ethereum-lists/chains/issues/126 https://github.com/ethereum-lists/chains/issues/126
*/ */
private fun parseWithMoshi(fileToParse: File) { private fun parseWithMoshi(fileToParse: File) {
val parsedChain = chainAdapter.fromJson(fileToParse.readText()) val parsedChain = chainAdapter.fromJson(fileToParse.readText())
if (parsedNames.contains(parsedChain!!.name)) { val parsedChainNormalizedName = parsedChain!!.name.normalizeName()
throw NameMustBeUnique(parsedChain.name) if (parsedNames.contains(parsedChainNormalizedName)) {
throw NameMustBeUnique(parsedChainNormalizedName)
} }
parsedNames.add(parsedChain.name) parsedNames.add(parsedChainNormalizedName)
if (parsedShortNames.contains(parsedChain.shortName)) { val parsedChainNormalizedShortName = parsedChain.shortName.normalizeName()
throw ShortNameMustBeUnique(parsedChain.shortName) if (parsedShortNames.contains(parsedChainNormalizedShortName)) {
throw ShortNameMustBeUnique(parsedChainNormalizedShortName)
} }
if (parsedChain.shortName == "*") { if (parsedChainNormalizedShortName == "*") {
throw ShortNameMustNotBeStar() throw ShortNameMustNotBeStar()
} }
parsedShortNames.add(parsedChain.shortName) parsedShortNames.add(parsedChainNormalizedShortName)
} }
private fun getNumber(jsonObject: JsonObject, field: String): Long { private fun getNumber(jsonObject: JsonObject, field: String): Long {