Remove network completely (#1506)

follow up of #1500
ethereum-lists · Aug 28, 2022 · a3cd16b · a3cd16b
1 parent 138535c
commit a3cd16b
Show file tree

Hide file tree

Showing 37 changed files with 0 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ The source data is in _data/chains. Each chain has its own file with the filenam
 {
   "name": "Ethereum Mainnet",
   "chain": "ETH",
-  "network": "mainnet",
   "rpc": [
     "https://mainnet.infura.io/v3/${INFURA_API_KEY}",
     "https://api.mycryptoapi.com/eth"

diff --git a/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt b/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt
@@ -8,7 +8,6 @@ data class Chain(
     val shortName: String,
     val chain: String,
     @Deprecated("Will be removed in the future")
-    val network: String?,
     val chainId: Long,
     val networkId: Long,
     val rpc: List<String>,

diff --git a/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt b/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt
@@ -25,7 +25,6 @@ val optionalFields = listOf(
     "icon",
     "explorers",
     "title",
-    "network",
     "parent",
     "status"
 )

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-1.nojson b/processor/src/test/resources/test_chains/invalid/eip155-1.nojson
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-100.json b/processor/src/test/resources/test_chains/invalid/eip155-100.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 100,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-101.json b/processor/src/test/resources/test_chains/invalid/eip155-101.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 101,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-102.json b/processor/src/test/resources/test_chains/invalid/eip155-102.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 102,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-2.json b/processor/src/test/resources/test_chains/invalid/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-3.json b/processor/src/test/resources/test_chains/invalid/eip155-3.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-4.json b/processor/src/test/resources/test_chains/invalid/eip155-4.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 4,
   "networkId": 4,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-99.json b/processor/src/test/resources/test_chains/invalid/eip155-99.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 99,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/eip155-invalid_filename.json b/processor/src/test/resources/test_chains/invalid/eip155-invalid_filename.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/explorerinvalidurl/eip155-1.json b/processor/src/test/resources/test_chains/invalid/explorerinvalidurl/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/explorermissingurl/eip155-1.json b/processor/src/test/resources/test_chains/invalid/explorermissingurl/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/explorernoname/eip155-1.json b/processor/src/test/resources/test_chains/invalid/explorernoname/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/explorersnotarray/eip155-1.json b/processor/src/test/resources/test_chains/invalid/explorersnotarray/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/extracomma/eip155-1.json b/processor/src/test/resources/test_chains/invalid/extracomma/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/invalid_status/eip155-1.json b/processor/src/test/resources/test_chains/invalid/invalid_status/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/invalid_status/eip155-2.json b/processor/src/test/resources/test_chains/invalid/invalid_status/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/sameshortname/eip155-1.json b/processor/src/test/resources/test_chains/invalid/sameshortname/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "willfail",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/sameshortname/eip155-5.json b/processor/src/test/resources/test_chains/invalid/sameshortname/eip155-5.json
@@ -1,7 +1,6 @@
 {
   "name": "Ethereum Testnet Görli",
   "chain": "ETH",
-  "network": "goerli",
   "rpc": [
     "https://rpc.goerli.mudit.blog/",
     "https://rpc.slock.it/goerli ",

diff --git a/processor/src/test/resources/test_chains/invalid/shortNameMustNotBeStar/eip155-1.json b/processor/src/test/resources/test_chains/invalid/shortNameMustNotBeStar/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "*",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentchaindoesnotexist/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentchaindoesnotexist/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/...src/test/resources/test_chains/invalid/withparentextrabridgeelementnoobject/eip155-2.json b/...src/test/resources/test_chains/invalid/withparentextrabridgeelementnoobject/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentextrabridgesfield/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentextrabridgesfield/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentextrabridgesnoarray/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentextrabridgesnoarray/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentextrafield/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentextrafield/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentinvalidtype/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentinvalidtype/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/withparentnobject/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentnobject/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/invalid/wrongexplorerstandard/eip155-1.json b/processor/src/test/resources/test_chains/invalid/wrongexplorerstandard/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/eip155-1.json b/processor/src/test/resources/test_chains/valid/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withexplorer/eip155-1.json b/processor/src/test/resources/test_chains/valid/withexplorer/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withexplorer/eip155-2.json b/processor/src/test/resources/test_chains/valid/withexplorer/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withparent/eip155-1.json b/processor/src/test/resources/test_chains/valid/withparent/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withparent/eip155-2.json b/processor/src/test/resources/test_chains/valid/withparent/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withparentbridge/eip155-1.json b/processor/src/test/resources/test_chains/valid/withparentbridge/eip155-1.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 1,
   "networkId": 1,
   "rpc": [

diff --git a/processor/src/test/resources/test_chains/valid/withparentbridge/eip155-2.json b/processor/src/test/resources/test_chains/valid/withparentbridge/eip155-2.json
@@ -2,7 +2,6 @@
   "name": "Ethereum Mainnet",
   "shortName": "eth",
   "chain": "ETH",
-  "network": "mainnet",
   "chainId": 2,
   "networkId": 2,
   "rpc": [