From a3cd16b7a7a1c2637439c99ce849b40e90668aeb Mon Sep 17 00:00:00 2001 From: ligi Date: Sun, 28 Aug 2022 12:25:12 +0200 Subject: [PATCH] Remove network completely (#1506) follow up of #1500 --- README.md | 1 - model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt | 1 - processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt | 1 - processor/src/test/resources/test_chains/invalid/eip155-1.nojson | 1 - processor/src/test/resources/test_chains/invalid/eip155-100.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-101.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-102.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-2.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-3.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-4.json | 1 - processor/src/test/resources/test_chains/invalid/eip155-99.json | 1 - .../resources/test_chains/invalid/eip155-invalid_filename.json | 1 - .../test_chains/invalid/explorerinvalidurl/eip155-1.json | 1 - .../test_chains/invalid/explorermissingurl/eip155-1.json | 1 - .../resources/test_chains/invalid/explorernoname/eip155-1.json | 1 - .../test_chains/invalid/explorersnotarray/eip155-1.json | 1 - .../test/resources/test_chains/invalid/extracomma/eip155-1.json | 1 - .../resources/test_chains/invalid/invalid_status/eip155-1.json | 1 - .../resources/test_chains/invalid/invalid_status/eip155-2.json | 1 - .../resources/test_chains/invalid/sameshortname/eip155-1.json | 1 - .../resources/test_chains/invalid/sameshortname/eip155-5.json | 1 - .../test_chains/invalid/shortNameMustNotBeStar/eip155-1.json | 1 - .../invalid/withparentchaindoesnotexist/eip155-2.json | 1 - .../invalid/withparentextrabridgeelementnoobject/eip155-2.json | 1 - .../invalid/withparentextrabridgesfield/eip155-2.json | 1 - .../invalid/withparentextrabridgesnoarray/eip155-2.json | 1 - .../test_chains/invalid/withparentextrafield/eip155-2.json | 1 - .../test_chains/invalid/withparentinvalidtype/eip155-2.json | 1 - .../test_chains/invalid/withparentnobject/eip155-2.json | 1 - .../test_chains/invalid/wrongexplorerstandard/eip155-1.json | 1 - processor/src/test/resources/test_chains/valid/eip155-1.json | 1 - .../test/resources/test_chains/valid/withexplorer/eip155-1.json | 1 - .../test/resources/test_chains/valid/withexplorer/eip155-2.json | 1 - .../test/resources/test_chains/valid/withparent/eip155-1.json | 1 - .../test/resources/test_chains/valid/withparent/eip155-2.json | 1 - .../resources/test_chains/valid/withparentbridge/eip155-1.json | 1 - .../resources/test_chains/valid/withparentbridge/eip155-2.json | 1 - 37 files changed, 37 deletions(-) diff --git a/README.md b/README.md index 6ae3a131..f9a1d6a5 100644 --- 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 index aae76462..426080c8 100644 --- 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, diff --git a/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt b/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt index ad442631..b84b67cd 100644 --- 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 index a6483037..e6ba8d6d 100644 --- 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 index 81e25dab..be3e346f 100644 --- 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 index 77b47d36..9768d76b 100644 --- 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 index 4fa97075..8f61b6df 100644 --- 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 index a6483037..e6ba8d6d 100644 --- 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 index a6483037..e6ba8d6d 100644 --- 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 index 49d70af7..1790caea 100644 --- 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 index a48d9479..9ae0c1b5 100644 --- 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 index a6483037..e6ba8d6d 100644 --- 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 index 90475a77..afd7ce7d 100644 --- 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 index 025499d0..d2d74220 100644 --- 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 index 38d9fd6f..343eecef 100644 --- 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 index 9895ba6d..6b49eaec 100644 --- 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 index 4d18cd85..ac02bd38 100644 --- 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 index 72d00fe8..dc92b7a3 100644 --- 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 index aaa9ffb3..e44809d8 100644 --- 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 index 104eaab3..be9aaacb 100644 --- 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 index d479df95..18e181d2 100644 --- 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 index bb4c8f1e..ef240a6f 100644 --- 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 index 165a4187..1ebb6218 100644 --- 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/processor/src/test/resources/test_chains/invalid/withparentextrabridgeelementnoobject/eip155-2.json b/processor/src/test/resources/test_chains/invalid/withparentextrabridgeelementnoobject/eip155-2.json index 7cc1fd47..79c1c991 100644 --- a/processor/src/test/resources/test_chains/invalid/withparentextrabridgeelementnoobject/eip155-2.json +++ b/processor/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 index e4007b5e..a244d6fa 100644 --- 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 index 8fa85245..ef334703 100644 --- 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 index 0be4e23e..0441db03 100644 --- 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 index e6e90ddc..c6cacfe0 100644 --- 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 index decf6653..8001553c 100644 --- 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 index c3f128fd..9b6119d3 100644 --- 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 index 457f8964..eabec8a2 100644 --- 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 index ef4eeb20..2658fd08 100644 --- 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 index fadae45a..7161c9da 100644 --- 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 index 457f8964..eabec8a2 100644 --- 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 index 165a4187..1ebb6218 100644 --- 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 index 457f8964..eabec8a2 100644 --- 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 index e6aef8e4..c5fe606b 100644 --- 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": [