diff --git a/ConnectionPort.java b/ConnectionPort.java index 1c48a71b333d79c03508bff93697e32f11d0c46c..c0134f578e6047db7237134da3c0037f1ac1c593 100644 --- a/ConnectionPort.java +++ b/ConnectionPort.java @@ -293,7 +293,7 @@ public class ConnectionPort { return account; } //might be removec in the future - public ConcurrentLinkedQueu<Block> getBlockChain() { + public ConcurrentLinkedQueue<Block> getBlockChain() { return blockChain; } @@ -692,7 +692,7 @@ public class ConnectionPort { if (mergeinfo!=null) { String repmerge = "OK\n"+mergeinfo; ps.println(repmerge); - bandwidthLog.println(getMicroTime()+","+rep.length()); + bandwidthLog.println(getMicroTime()+","+repmerge.length()); } else { ps.println("FAIL"); bandwidthLog.println(getMicroTime()+",4"); @@ -863,7 +863,7 @@ public class ConnectionPort { maxBufferSize = 10000; blockBuffer = new ConcurrentHashMap<>();//for blockchain, respond block request mergeInfoBuffer = new ConcurrentHashMap<>();//for blockchain, respond mergeInfo request - blockChain = new ConcurrentLinkeQueue<>();//for blockchain.only to read, no write. might be useless because we introduce blockBuffer + blockChain = new ConcurrentLinkedQueue<>();//for blockchain.only to read, no write. might be useless because we introduce blockBuffer account = new ConcurrentHashMap<>();//for blockchain. only to read, no write.might be useless because we introduce mergeInfoBuffer solutions = new LinkedBlockingDeque<>(); verification = new LinkedBlockingDeque<>();