Wrong network ID and network type

[0x31]

Expected behavior

web3.eth.net.getId() should call net_version and return the current network id.

https://github.com/ethereum/web3.js/blob/1d9f6c0889c7f551b4ec1041cece0d50bc3ff2c8/packages/web3-net/src/index.js#L38-L43

Actual behavior

From 1.0.0-beta.38 onwards, web3.eth.net.getId calls eth_protocolVersion and returns the current ethereum protocol version.

https://github.com/ethereum/web3.js/blob/10face700362d124bc877ba6ea1390bde8364447/packages/web3-core-method/src/methods/network/VersionMethod.js#L25-L34

Steps to reproduce the behavior

> const Web3 = require("web3")
> let web3 = new Web3("https://mainnet.infura.io")
> web3.eth.net.getId().then(console.log)
63 // should be 1
> web3.eth.net.getNetworkType().then(console.log)
"private" // should be "main"

Versions

web3.js 1.0.0-beta.38 and 1.0.0-beta.39