Polish whitespace and imports
As part of pull request #179, commits0d922e1
,003249c
andd099100
introduced use of Java 8 language features and APIs. Commitc95f5ea
manually reverted these changes (see #184 as to why), but in the process re-introduced formatting issues originally cleaned up by other commits in #179. This change fixes those formatting issues. - Replace leading tabs with spaces (for reasons detailed in0827fb5
) - Add space before opening curly brace - Optimize imports using shared .idea/codeStyleSettings.xml (note especially expansion of wildcard imports. See rationale in780393d
) - Do not align assignments on equals sign - Remove unnecessary additional newlines - Remove braces from single-line loops and conditionals
This commit is contained in:
parent
c95f5ea75f
commit
a155518b41
|
@ -13,21 +13,17 @@ plugins {
|
||||||
|
|
||||||
mainClassName = 'org.ethereum.Start'
|
mainClassName = 'org.ethereum.Start'
|
||||||
|
|
||||||
|
|
||||||
ext.generatedSrcDir = file('src/gen/java')
|
ext.generatedSrcDir = file('src/gen/java')
|
||||||
|
|
||||||
sourceSets.main.java.srcDirs += generatedSrcDir
|
sourceSets.main.java.srcDirs += generatedSrcDir
|
||||||
|
|
||||||
|
|
||||||
antlr4 {
|
antlr4 {
|
||||||
extraArgs = ['-package', 'org.ethereum.serpent']
|
extraArgs = ['-package', 'org.ethereum.serpent']
|
||||||
output = file("${generatedSrcDir}/org/ethereum/serpent")
|
output = file("${generatedSrcDir}/org/ethereum/serpent")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
compileJava.dependsOn antlr4
|
compileJava.dependsOn antlr4
|
||||||
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
compile.extendsFrom antlr4
|
compile.extendsFrom antlr4
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,8 @@ public class Wallet {
|
||||||
Account account = new Account();
|
Account account = new Account();
|
||||||
String address = Hex.toHexString(account.getEcKey().getAddress());
|
String address = Hex.toHexString(account.getEcKey().getAddress());
|
||||||
rows.put(address, account);
|
rows.put(address, account);
|
||||||
for (WalletListener listener : listeners) listener.valueChanged();
|
for (WalletListener listener : listeners)
|
||||||
|
listener.valueChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void importKey(byte[] privKey) {
|
public void importKey(byte[] privKey) {
|
||||||
|
|
|
@ -74,9 +74,8 @@ public class BlockStore {
|
||||||
setParameter("limit", block.getNumber() - qty).
|
setParameter("limit", block.getNumber() - qty).
|
||||||
setMaxResults(qty).list();
|
setMaxResults(qty).list();
|
||||||
|
|
||||||
for (byte[] h : result){
|
for (byte[] h : result)
|
||||||
hashes.add(h);
|
hashes.add(h);
|
||||||
}
|
|
||||||
|
|
||||||
return hashes;
|
return hashes;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
package org.ethereum.manager;
|
package org.ethereum.manager;
|
||||||
|
|
||||||
import org.ethereum.core.*;
|
import org.ethereum.core.Block;
|
||||||
|
import org.ethereum.core.Genesis;
|
||||||
|
import org.ethereum.core.Transaction;
|
||||||
|
import org.ethereum.core.TransactionReceipt;
|
||||||
|
import org.ethereum.core.Wallet;
|
||||||
import org.ethereum.crypto.HashUtil;
|
import org.ethereum.crypto.HashUtil;
|
||||||
import org.ethereum.db.BlockStore;
|
import org.ethereum.db.BlockStore;
|
||||||
import org.ethereum.facade.Blockchain;
|
import org.ethereum.facade.Blockchain;
|
||||||
|
|
|
@ -48,8 +48,7 @@ public class BlockHashesMessage extends EthMessage {
|
||||||
encodedElements.add(RLP.encodeByte(BLOCK_HASHES.asByte()));
|
encodedElements.add(RLP.encodeByte(BLOCK_HASHES.asByte()));
|
||||||
for (byte[] blockHash : blockHashes)
|
for (byte[] blockHash : blockHashes)
|
||||||
encodedElements.add(RLP.encodeElement(blockHash));
|
encodedElements.add(RLP.encodeElement(blockHash));
|
||||||
byte[][] encodedElementArray = encodedElements
|
byte[][] encodedElementArray = encodedElements.toArray(new byte[encodedElements.size()][]);
|
||||||
.toArray(new byte[encodedElements.size()][]);
|
|
||||||
this.encoded = RLP.encodeList(encodedElementArray);
|
this.encoded = RLP.encodeList(encodedElementArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,9 +46,8 @@ public class BlocksMessage extends EthMessage {
|
||||||
List<byte[]> encodedElements = new Vector<>();
|
List<byte[]> encodedElements = new Vector<>();
|
||||||
encodedElements.add(RLP.encodeByte(BLOCKS.asByte()));
|
encodedElements.add(RLP.encodeByte(BLOCKS.asByte()));
|
||||||
|
|
||||||
for (Block block : blocks){
|
for (Block block : blocks)
|
||||||
encodedElements.add(block.getEncoded());
|
encodedElements.add(block.getEncoded());
|
||||||
}
|
|
||||||
|
|
||||||
byte[][] encodedElementArray = encodedElements
|
byte[][] encodedElementArray = encodedElements
|
||||||
.toArray(new byte[encodedElements.size()][]);
|
.toArray(new byte[encodedElements.size()][]);
|
||||||
|
|
|
@ -46,8 +46,7 @@ public class GetBlocksMessage extends EthMessage {
|
||||||
encodedElements.add(RLP.encodeByte(GET_BLOCKS.asByte()));
|
encodedElements.add(RLP.encodeByte(GET_BLOCKS.asByte()));
|
||||||
for (byte[] hash : blockHashes)
|
for (byte[] hash : blockHashes)
|
||||||
encodedElements.add(RLP.encodeElement(hash));
|
encodedElements.add(RLP.encodeElement(hash));
|
||||||
byte[][] encodedElementArray = encodedElements
|
byte[][] encodedElementArray = encodedElements.toArray(new byte[encodedElements.size()][]);
|
||||||
.toArray(new byte[encodedElements.size()][]);
|
|
||||||
this.encoded = RLP.encodeList(encodedElementArray);
|
this.encoded = RLP.encodeList(encodedElementArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,8 +54,7 @@ public class TransactionsMessage extends EthMessage {
|
||||||
encodedElements.add(RLP.encodeByte(TRANSACTIONS.asByte()));
|
encodedElements.add(RLP.encodeByte(TRANSACTIONS.asByte()));
|
||||||
for (Transaction tx : transactions)
|
for (Transaction tx : transactions)
|
||||||
encodedElements.add(tx.getEncoded());
|
encodedElements.add(tx.getEncoded());
|
||||||
byte[][] encodedElementArray = encodedElements
|
byte[][] encodedElementArray = encodedElements.toArray(new byte[encodedElements.size()][]);
|
||||||
.toArray(new byte[encodedElements.size()][]);
|
|
||||||
this.encoded = RLP.encodeList(encodedElementArray);
|
this.encoded = RLP.encodeList(encodedElementArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,8 +207,9 @@ public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> {
|
||||||
private void setHandshake(HelloMessage msg, ChannelHandlerContext ctx) {
|
private void setHandshake(HelloMessage msg, ChannelHandlerContext ctx) {
|
||||||
|
|
||||||
this.handshakeHelloMessage = msg;
|
this.handshakeHelloMessage = msg;
|
||||||
if (msg.getP2PVersion() != P2pHandler.VERSION)
|
if (msg.getP2PVersion() != P2pHandler.VERSION) {
|
||||||
msgQueue.sendMessage(new DisconnectMessage(ReasonCode.INCOMPATIBLE_PROTOCOL));
|
msgQueue.sendMessage(new DisconnectMessage(ReasonCode.INCOMPATIBLE_PROTOCOL));
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
List<Capability> capInCommon = new ArrayList<>();
|
List<Capability> capInCommon = new ArrayList<>();
|
||||||
for (Capability capability : msg.getCapabilities()) {
|
for (Capability capability : msg.getCapabilities()) {
|
||||||
|
|
|
@ -60,9 +60,8 @@ public class PeerDiscovery {
|
||||||
threadFactory = Executors.defaultThreadFactory();
|
threadFactory = Executors.defaultThreadFactory();
|
||||||
|
|
||||||
// creating the ThreadPoolExecutor
|
// creating the ThreadPoolExecutor
|
||||||
executorPool = new ThreadPoolExecutor(CONFIG.peerDiscoveryWorkers(),
|
executorPool = new ThreadPoolExecutor(CONFIG.peerDiscoveryWorkers(), CONFIG.peerDiscoveryWorkers(), 10,
|
||||||
CONFIG.peerDiscoveryWorkers(), 10, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(
|
TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(1000), threadFactory, rejectionHandler);
|
||||||
1000), threadFactory, rejectionHandler);
|
|
||||||
|
|
||||||
// start the monitoring thread
|
// start the monitoring thread
|
||||||
monitor = new PeerMonitorThread(executorPool, 1, this);
|
monitor = new PeerMonitorThread(executorPool, 1, this);
|
||||||
|
|
|
@ -108,10 +108,9 @@ public class ChannelManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reconnect(){
|
public void reconnect(){
|
||||||
for (Channel channel : channels){
|
for (Channel channel : channels)
|
||||||
channel.p2pHandler.sendDisconnect();
|
channel.p2pHandler.sendDisconnect();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public void ethSync() {
|
public void ethSync() {
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,11 @@ import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.spongycastle.util.encoders.Hex;
|
import org.spongycastle.util.encoders.Hex;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.Arrays;
|
||||||
import java.util.stream.Collectors;
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import static java.util.Arrays.copyOfRange;
|
import static java.util.Arrays.copyOfRange;
|
||||||
import static org.ethereum.crypto.HashUtil.EMPTY_TRIE_HASH;
|
import static org.ethereum.crypto.HashUtil.EMPTY_TRIE_HASH;
|
||||||
|
@ -437,14 +440,11 @@ public class TrieImpl implements Trie {
|
||||||
Map<ByteArrayWrapper, Node> nodes = this.getCache().getNodes();
|
Map<ByteArrayWrapper, Node> nodes = this.getCache().getNodes();
|
||||||
Set<ByteArrayWrapper> toRemoveSet = new HashSet<>();
|
Set<ByteArrayWrapper> toRemoveSet = new HashSet<>();
|
||||||
|
|
||||||
for (ByteArrayWrapper key : nodes.keySet()) {
|
for (ByteArrayWrapper key : nodes.keySet())
|
||||||
if (!hashSet.contains(key.getData())) {
|
if (!hashSet.contains(key.getData()))
|
||||||
toRemoveSet.add(key);
|
toRemoveSet.add(key);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (ByteArrayWrapper key : toRemoveSet) {
|
for (ByteArrayWrapper key : toRemoveSet) {
|
||||||
|
|
||||||
this.getCache().delete(key.getData());
|
this.getCache().delete(key.getData());
|
||||||
|
|
||||||
if (logger.isTraceEnabled())
|
if (logger.isTraceEnabled())
|
||||||
|
|
|
@ -26,9 +26,8 @@ public class RLPList extends ArrayList<RLPElement> implements RLPElement {
|
||||||
|
|
||||||
RLPList rlpList = (RLPList) element;
|
RLPList rlpList = (RLPList) element;
|
||||||
System.out.print("[");
|
System.out.print("[");
|
||||||
for (RLPElement singleElement : rlpList) {
|
for (RLPElement singleElement : rlpList)
|
||||||
recursivePrint(singleElement);
|
recursivePrint(singleElement);
|
||||||
}
|
|
||||||
System.out.print("]");
|
System.out.print("]");
|
||||||
} else {
|
} else {
|
||||||
String hex = ByteUtil.toHexString(element.getRLPData());
|
String hex = ByteUtil.toHexString(element.getRLPData());
|
||||||
|
|
|
@ -77,11 +77,9 @@ public class GitHubJSONTestSuite {
|
||||||
TestRunner runner = new TestRunner();
|
TestRunner runner = new TestRunner();
|
||||||
List<String> result = runner.runTestCase(testCase);
|
List<String> result = runner.runTestCase(testCase);
|
||||||
|
|
||||||
if (!result.isEmpty()){
|
if (!result.isEmpty())
|
||||||
for (String single : result){
|
for (String single : result)
|
||||||
logger.info(single);
|
logger.info(single);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.assertTrue(result.isEmpty());
|
Assert.assertTrue(result.isEmpty());
|
||||||
}
|
}
|
||||||
|
@ -109,11 +107,9 @@ public class GitHubJSONTestSuite {
|
||||||
TestRunner runner = new TestRunner();
|
TestRunner runner = new TestRunner();
|
||||||
List<String> result = runner.runTestCase(testCase);
|
List<String> result = runner.runTestCase(testCase);
|
||||||
|
|
||||||
if (!result.isEmpty()){
|
if (!result.isEmpty())
|
||||||
for (String single : result){
|
for (String single : result)
|
||||||
logger.info(single);
|
logger.info(single);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.assertTrue(result.isEmpty());
|
Assert.assertTrue(result.isEmpty());
|
||||||
}
|
}
|
||||||
|
@ -135,11 +131,9 @@ public class GitHubJSONTestSuite {
|
||||||
TestRunner runner = new TestRunner();
|
TestRunner runner = new TestRunner();
|
||||||
List<String> result = runner.runTestCase(testCase);
|
List<String> result = runner.runTestCase(testCase);
|
||||||
|
|
||||||
if (!result.isEmpty()){
|
if (!result.isEmpty())
|
||||||
for (String single : result){
|
for (String single : result)
|
||||||
logger.info(single);
|
logger.info(single);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.assertTrue(result.isEmpty());
|
Assert.assertTrue(result.isEmpty());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue