@@ -400,7 +400,7 @@ public class PeerConnectionManager implements PeerService, PeerConnector { | |||||
if (ledgerHashs != null) { | if (ledgerHashs != null) { | ||||
ledgerSize = ledgerHashs.length; | ledgerSize = ledgerHashs.length; | ||||
for (HashDigest h : ledgerHashs) { | for (HashDigest h : ledgerHashs) { | ||||
LOGGER.info("Most peer[{}] get ledger direct [{}]", mostLedgerPeerServiceFactory.peerAddress, h.toBase58()); | |||||
LOGGER.debug("Most peer[{}] get ledger direct [{}]", mostLedgerPeerServiceFactory.peerAddress, h.toBase58()); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -423,7 +423,7 @@ public class PeerConnectionManager implements PeerService, PeerConnector { | |||||
HashDigest[] tempLedgerHashs = ((PeerServiceProxy) loopBlockchainService).getLedgerHashsDirect(); | HashDigest[] tempLedgerHashs = ((PeerServiceProxy) loopBlockchainService).getLedgerHashsDirect(); | ||||
if (tempLedgerHashs != null) { | if (tempLedgerHashs != null) { | ||||
for (HashDigest h : tempLedgerHashs) { | for (HashDigest h : tempLedgerHashs) { | ||||
LOGGER.info("Temp peer[{}] get ledger direct [{}]", entry.getKey(), h.toBase58()); | |||||
LOGGER.debug("Temp peer[{}] get ledger direct [{}]", entry.getKey(), h.toBase58()); | |||||
} | } | ||||
if (tempLedgerHashs.length > ledgerSize) { | if (tempLedgerHashs.length > ledgerSize) { | ||||
tempMostLedgerPeerServiceFactory = new PeerServiceFactory(entry.getKey(),entry.getValue()); | tempMostLedgerPeerServiceFactory = new PeerServiceFactory(entry.getKey(),entry.getValue()); | ||||
@@ -40,12 +40,6 @@ | |||||
</exclusions> | </exclusions> | ||||
</dependency> | </dependency> | ||||
<dependency> | |||||
<groupId>com.jd.blockchain</groupId> | |||||
<artifactId>consensus-bftsmart</artifactId> | |||||
<version>${project.version}</version> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>com.jd.blockchain</groupId> | <groupId>com.jd.blockchain</groupId> | ||||
<artifactId>utils-serialize</artifactId> | <artifactId>utils-serialize</artifactId> | ||||
@@ -1,7 +1,6 @@ | |||||
package com.jd.blockchain.sdk.service; | package com.jd.blockchain.sdk.service; | ||||
import com.jd.blockchain.consensus.*; | import com.jd.blockchain.consensus.*; | ||||
import com.jd.blockchain.consensus.bftsmart.client.BftsmartClientSettings; | |||||
import com.jd.blockchain.consensus.client.ClientFactory; | import com.jd.blockchain.consensus.client.ClientFactory; | ||||
import com.jd.blockchain.consensus.client.ClientSettings; | import com.jd.blockchain.consensus.client.ClientSettings; | ||||
import com.jd.blockchain.consensus.client.ConsensusClient; | import com.jd.blockchain.consensus.client.ConsensusClient; | ||||
@@ -148,15 +147,6 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C | |||||
ClientSettings clientSettings = clientFactory.buildClientSettings(clientIncomingSettings); | ClientSettings clientSettings = clientFactory.buildClientSettings(clientIncomingSettings); | ||||
ConsensusClient consensusClient = clientFactory.setupClient(clientSettings); | ConsensusClient consensusClient = clientFactory.setupClient(clientSettings); | ||||
if (clientSettings instanceof BftsmartClientSettings) { | |||||
BftsmartClientSettings bftsmartClientSettings = (BftsmartClientSettings) clientSettings; | |||||
byte[] topology = bftsmartClientSettings.getTopology(); | |||||
byte[] tomConfig = bftsmartClientSettings.getTomConfig(); | |||||
LOGGER.info("Peer[{}] ledger = [{}] topology : {}, tomConfig : {}", peerAddr, | |||||
ledgerSetting.getLedgerHash().toBase58(), topology == null ? 0 : topology.length , | |||||
tomConfig == null ? 0 : tomConfig.length); | |||||
} | |||||
TransactionService autoSigningTxProcService = enableGatewayAutoSigning(gatewayKey, | TransactionService autoSigningTxProcService = enableGatewayAutoSigning(gatewayKey, | ||||
ledgerSetting.getCryptoSetting(), consensusClient); | ledgerSetting.getCryptoSetting(), consensusClient); | ||||
LedgerAccessContextImpl accCtx = new LedgerAccessContextImpl(); | LedgerAccessContextImpl accCtx = new LedgerAccessContextImpl(); | ||||
@@ -190,9 +180,6 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C | |||||
} | } | ||||
} | } | ||||
} | } | ||||
// PeerBlockchainServiceFactory factory = new PeerBlockchainServiceFactory(httpConnectionManager, | |||||
// accessAbleLedgers); | |||||
} | } | ||||
@@ -93,9 +93,6 @@ public class PeerServiceProxy extends BlockchainServiceProxy implements Transact | |||||
Collection<LedgerAccessContext> ctxs = ledgerAccessContexts.values(); | Collection<LedgerAccessContext> ctxs = ledgerAccessContexts.values(); | ||||
for (LedgerAccessContext ctx : ctxs) { | for (LedgerAccessContext ctx : ctxs) { | ||||
HashDigest[] hashs = ctx.getQueryService().getLedgerHashs(); | HashDigest[] hashs = ctx.getQueryService().getLedgerHashs(); | ||||
for (HashDigest h : hashs) { | |||||
LOGGER.info("Get ledger[{}] by [{}]'s AccessContext !!!", h.toBase58(), ctx.getLedgerHash().toBase58()); | |||||
} | |||||
ledgerHashs.addAll(Arrays.asList(hashs)); | ledgerHashs.addAll(Arrays.asList(hashs)); | ||||
} | } | ||||
} | } | ||||