CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NC-1805] net_version should return the network ID not the chain ID (#162)

Browse Source 
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Adrian Sutton 6 years ago committed by GitHub
parent 4d79dba5a0
commit 9a3e2dfb30
7 changed files with 50 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
  2. 8
      ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java
  3. 14
      ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java
  4. 9
      pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java
  5. 7
      pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
  6. 2
      pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java
  7. 34
      pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java

1
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
Unescape View File

@ -71,6 +71,7 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner {
pantheonController,
true,
node.bootnodes(),
NETWORK_ID,
node.getHost(),
node.p2pPort(),
25,

8
ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java
Unescape View File

@ -87,7 +87,7 @@ public class JsonRpcMethodsFactory {
public Map<String, JsonRpcMethod> methods(
final String clientVersion,
final String chainId,
final String networkId,
final P2PNetwork peerNetworkingService,
final Blockchain blockchain,
final WorldStateArchive worldStateArchive,
@ -102,7 +102,7 @@ public class JsonRpcMethodsFactory {
new BlockchainQueries(blockchain, worldStateArchive);
return methods(
clientVersion,
chainId,
networkId,
peerNetworkingService,
blockchainQueries,
synchronizer,
@ -116,7 +116,7 @@ public class JsonRpcMethodsFactory {
public Map<String, JsonRpcMethod> methods(
final String clientVersion,
final String chainId,
final String networkId,
final P2PNetwork p2pNetwork,
final BlockchainQueries blockchainQueries,
final Synchronizer synchronizer,
@ -195,7 +195,7 @@ public class JsonRpcMethodsFactory {
if (rpcApis.contains(RpcApis.NET)) {
addMethods(
enabledMethods,
new NetVersion(chainId),
new NetVersion(networkId),
new NetListening(p2pNetwork),
new NetPeerCount(p2pNetwork),
new AdminPeers(p2pNetwork));

14
ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java
Unescape View File

@ -16,17 +16,11 @@ import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse;
/**
* In Consensys' client, net_version maps to the network id, as specified in *
* https://github.com/ethereum/wiki/wiki/JSON-RPC#net_version
*
* <p>This method can be deprecated in the future, @see https://github.com/ethereum/EIPs/issues/611
*/
public class NetVersion implements JsonRpcMethod {
private final String chainId;
private final String networkId;
public NetVersion(final String chainId) {
this.chainId = chainId;
public NetVersion(final String networkId) {
this.networkId = networkId;
}
@Override
@ -36,6 +30,6 @@ public class NetVersion implements JsonRpcMethod {
@Override
public JsonRpcResponse response(final JsonRpcRequest req) {
return new JsonRpcSuccessResponse(req.getId(), chainId);
return new JsonRpcSuccessResponse(req.getId(), networkId);
}
}

9
pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java
Unescape View File

@ -73,6 +73,7 @@ public class RunnerBuilder {
final PantheonController<?, ?> pantheonController,
final boolean discovery,
final Collection<?> bootstrapPeers,
final int networkId,
final String discoveryHost,
final int listenPort,
final int maxPeers,
@ -150,7 +151,7 @@ public class RunnerBuilder {
jsonRpcMethods(
context,
protocolSchedule,
pantheonController,
networkId,
networkRunner,
synchronizer,
transactionPool,
@ -168,7 +169,7 @@ public class RunnerBuilder {
jsonRpcMethods(
context,
protocolSchedule,
pantheonController,
networkId,
networkRunner,
synchronizer,
transactionPool,
@ -213,7 +214,7 @@ public class RunnerBuilder {
private Map<String, JsonRpcMethod> jsonRpcMethods(
final ProtocolContext<?> context,
final ProtocolSchedule<?> protocolSchedule,
final PantheonController<?, ?> pantheonController,
final int networkId,
final NetworkRunner networkRunner,
final Synchronizer synchronizer,
final TransactionPool transactionPool,
@ -225,7 +226,7 @@ public class RunnerBuilder {
new JsonRpcMethodsFactory()
.methods(
PantheonInfo.version(),
String.valueOf(pantheonController.getGenesisConfig().getChainId()),
String.valueOf(networkId),
networkRunner.getNetwork(),
context.getBlockchain(),
context.getWorldStateArchive(),

7
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Unescape View File

@ -414,7 +414,7 @@ public class PantheonCommand implements Runnable {
synchronize(
buildController(),
noPeerDiscovery,
ethNetworkConfig.getBootNodes(),
ethNetworkConfig,
maxPeers,
p2pHostAndPort,
jsonRpcConfiguration(),
@ -467,7 +467,7 @@ public class PantheonCommand implements Runnable {
private void synchronize(
final PantheonController<?, ?> controller,
final boolean noPeerDiscovery,
final Collection<?> bootstrapNodes,
final EthNetworkConfig ethNetworkConfig,
final int maxPeers,
final HostAndPort discoveryHostAndPort,
final JsonRpcConfiguration jsonRpcConfiguration,
@ -481,7 +481,8 @@ public class PantheonCommand implements Runnable {
Vertx.vertx(),
controller,
!noPeerDiscovery,
bootstrapNodes,
ethNetworkConfig.getBootNodes(),
ethNetworkConfig.getNetworkId(),
discoveryHostAndPort.getHost(),
discoveryHostAndPort.getPort(),
maxPeers,

2
pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java
Unescape View File

@ -120,6 +120,7 @@ public final class RunnerTest {
controllerAhead,
true,
Collections.emptyList(),
NETWORK_ID,
listenHost,
0,
3,
@ -153,6 +154,7 @@ public final class RunnerTest {
listenHost,
runnerAhead.getP2pUdpPort(),
runnerAhead.getP2pTcpPort())),
NETWORK_ID,
listenHost,
0,
3,

34
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Unescape View File

@ -88,6 +88,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -130,6 +131,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
eq(true),
eq(MAINNET_BOOTSTRAP_NODES),
eq(1),
eq("127.0.0.1"),
eq(30303),
eq(25),
@ -257,6 +259,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
eq(false),
stringListArgumentCaptor.capture(),
eq(1),
eq("1.2.3.4"),
eq(1234),
eq(42),
@ -310,6 +313,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
eq(true),
eq(MAINNET_BOOTSTRAP_NODES),
eq(1),
eq("127.0.0.1"),
eq(30303),
eq(25),
@ -368,7 +372,17 @@ public class PantheonCommandTest extends CommandTestAbstract {
verify(mockRunnerBuilder)
.build(
any(), any(), eq(false), any(), anyString(), anyInt(), anyInt(), any(), any(), any());
any(),
any(),
eq(false),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
any(),
any(),
any());
assertThat(commandOutput.toString()).isEmpty();
assertThat(commandErrorOutput.toString()).isEmpty();
@ -394,6 +408,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
stringListArgumentCaptor.capture(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -420,6 +435,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
stringArgumentCaptor.capture(),
intArgumentCaptor.capture(),
anyInt(),
@ -446,6 +462,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
intArgumentCaptor.capture(),
@ -492,6 +509,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -515,6 +533,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -538,6 +557,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -565,6 +585,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -590,6 +611,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -615,6 +637,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -640,6 +663,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -665,6 +689,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -736,6 +761,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -759,6 +785,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -782,6 +809,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -808,6 +836,7 @@ public class PantheonCommandTest extends CommandTestAbstract {
any(),
anyBoolean(),
any(),
anyInt(),
anyString(),
anyInt(),
anyInt(),
@ -826,9 +855,6 @@ public class PantheonCommandTest extends CommandTestAbstract {
public void pantheonDoesNotStartInMiningModeIfCoinbaseNotSet() throws Exception {
parseCommand("--miner-enabled");
final ArgumentCaptor<MiningParameters> miningArg =
ArgumentCaptor.forClass(MiningParameters.class);
verifyZeroInteractions(mockControllerBuilder);
}

Write Preview
Loading…
Cancel
Save