Merge 51ca5c3 into fe16895

helpers/get-net-properties.js

@@ -17,23 +17,23 @@ function getNetworkDisplayName(network) {
 	const netID = parseInt(network)
 	switch (netID) {
 	case MAINNET_CODE:
-		return 'Main Ethereum Network'
+		return 'Ethereum'
 	case ROPSTEN_CODE:
-		return 'Ropsten Test Network'
+		return 'Ropsten Testnet'
 	case RINKEBY_CODE:
-		return 'Rinkeby Test Network'
+		return 'Rinkeby Testnet'
 	case GOERLI_CODE:
-		return 'Görli Test Network'
+		return 'Görli Testnet'
 	case KOVAN_CODE:
-		return 'Kovan Test Network'
+		return 'Kovan Testnet'
 	case SOKOL_CODE:
-		return 'Sokol Test Network'
+		return 'Sokol Testnet'
 	case POA_CORE_CODE:
 		return 'POA Core'
 	case XDAI_CODE:
 		return 'xDai Chain'
 	case RSK_CODE:
-		return 'RSK Mainnet'
+		return 'RSK'
 	case RSK_TESTNET_CODE:
 		return 'RSK Testnet'
 	case CLASSIC_CODE:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eth-net-props",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Get properties of EMV-based network",
   "main": "index.js",
   "directories": {

test/test.js

@@ -250,7 +250,7 @@ describe('eth-net-props', () => {
 	claimPrefix = 'should return correct display name for'
 	describe('get network properties', () => {
 		it(`${claimPrefix} Sokol POA Network`, () => {
-			assert.equal(netProps.getNetworkDisplayName(77), 'Sokol Test Network')
+			assert.equal(netProps.getNetworkDisplayName(77), 'Sokol Testnet')
 		})
 		it(`${claimPrefix} Core POA Network`, () => {
 			assert.equal(netProps.getNetworkDisplayName(99), 'POA Core')
@@ -259,31 +259,31 @@ describe('eth-net-props', () => {
 			assert.equal(netProps.getNetworkDisplayName(100), 'xDai Chain')
 		})
 		it(`${claimPrefix} Mainnet`, () => {
-			assert.equal(netProps.getNetworkDisplayName(1), 'Main Ethereum Network')
+			assert.equal(netProps.getNetworkDisplayName(1), 'Ethereum')
 		})
 		it(`${claimPrefix} RSK Mainnet`, () => {
-			assert.equal(netProps.getNetworkDisplayName(30), 'RSK Mainnet')
+			assert.equal(netProps.getNetworkDisplayName(30), 'RSK')
 		})
 		it(`${claimPrefix} Ropsten`, () => {
-			assert.equal(netProps.getNetworkDisplayName(3), 'Ropsten Test Network')
+			assert.equal(netProps.getNetworkDisplayName(3), 'Ropsten Testnet')
 		})
 		it(`${claimPrefix} Rinkeby`, () => {
-			assert.equal(netProps.getNetworkDisplayName(4), 'Rinkeby Test Network')
+			assert.equal(netProps.getNetworkDisplayName(4), 'Rinkeby Testnet')
 		})
 		it(`${claimPrefix} Kovan`, () => {
-			assert.equal(netProps.getNetworkDisplayName(42), 'Kovan Test Network')
+			assert.equal(netProps.getNetworkDisplayName(42), 'Kovan Testnet')
 		})
 		it(`${claimPrefix} RSK Testnet`, () => {
 			assert.equal(netProps.getNetworkDisplayName(31), 'RSK Testnet')
 		})
 		it(`${claimPrefix} Goerli Testnet`, () => {
-			assert.equal(netProps.getNetworkDisplayName(5), 'Görli Test Network')
+			assert.equal(netProps.getNetworkDisplayName(5), 'Görli Testnet')
 		})
 		it(`${claimPrefix} Ethereum Classic`, () => {
 			assert.equal(netProps.getNetworkDisplayName(61), 'Ethereum Classic')
 		})
 		it(`${claimPrefix} Sokol POA Network`, () => {
-			assert.equal(netProps.getNetworkDisplayName('77'), 'Sokol Test Network')
+			assert.equal(netProps.getNetworkDisplayName('77'), 'Sokol Testnet')
 		})
 
 		claimPrefix = 'should return correct coin name for'