Skip to content

Commit 9d81cea

Browse files
author
Sunny Jiao
committed
fix style
1 parent 3099659 commit 9d81cea

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

framework/src/main/java/org/tron/core/Wallet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
import com.google.common.collect.DiscreteDomain;
4646
import com.google.common.collect.ImmutableList;
4747
import com.google.common.collect.Lists;
48-
import com.google.common.collect.Range;
4948
import com.google.common.collect.Maps;
49+
import com.google.common.collect.Range;
5050
import com.google.protobuf.ByteString;
5151
import com.google.protobuf.InvalidProtocolBufferException;
5252
import com.google.protobuf.ProtocolStringList;
@@ -164,9 +164,9 @@
164164
import org.tron.core.capsule.TransactionInfoCapsule;
165165
import org.tron.core.capsule.TransactionResultCapsule;
166166
import org.tron.core.capsule.TransactionRetCapsule;
167+
import org.tron.core.capsule.VotesCapsule;
167168
import org.tron.core.capsule.WitnessCapsule;
168169
import org.tron.core.capsule.utils.MarketUtils;
169-
import org.tron.core.capsule.VotesCapsule;
170170
import org.tron.core.config.args.Args;
171171
import org.tron.core.db.BandwidthProcessor;
172172
import org.tron.core.db.BlockIndexStore;
@@ -778,7 +778,7 @@ public WitnessList getPaginatedNowWitnessList(long offset, long limit) {
778778
limit = WITNESS_COUNT_LIMIT_MAX;
779779
}
780780

781-
// Get all witnesses from the store, it contains the final vote count at the end of the last epoch.
781+
// It contains the final vote count at the end of the last epoch.
782782
List<WitnessCapsule> witnessCapsuleList = chainBaseManager.getWitnessStore().getAllWitnesses();
783783
if (offset >= witnessCapsuleList.size()) {
784784
return null;

framework/src/main/java/org/tron/core/services/http/GetPaginatedNowWitnessListServlet.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package org.tron.core.services.http;
22

3+
import java.io.IOException;
4+
import javax.servlet.http.HttpServletRequest;
5+
import javax.servlet.http.HttpServletResponse;
36
import lombok.extern.slf4j.Slf4j;
47
import org.springframework.beans.factory.annotation.Autowired;
58
import org.springframework.stereotype.Component;
69
import org.tron.api.GrpcAPI;
7-
import org.tron.api.GrpcAPI.WitnessList;
810
import org.tron.core.Wallet;
9-
import javax.servlet.http.HttpServletRequest;
10-
import javax.servlet.http.HttpServletResponse;
11-
import java.io.IOException;
12-
1311

1412
// Get the paged list of witnesses info with realtime vote counts
1513
@Component

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.util.EnumSet;
44
import javax.servlet.DispatcherType;
55
import lombok.extern.slf4j.Slf4j;
6-
import org.eclipse.jetty.server.ConnectionLimit;
7-
import org.eclipse.jetty.server.Server;
86
import org.eclipse.jetty.servlet.FilterHolder;
97
import org.eclipse.jetty.servlet.ServletContextHandler;
108
import org.eclipse.jetty.servlet.ServletHolder;
@@ -46,6 +44,7 @@
4644
import org.tron.core.services.interfaceOnSolidity.http.GetNodeInfoOnSolidityServlet;
4745
import org.tron.core.services.interfaceOnSolidity.http.GetNowBlockOnSolidityServlet;
4846
import org.tron.core.services.interfaceOnSolidity.http.GetPaginatedAssetIssueListOnSolidityServlet;
47+
import org.tron.core.services.interfaceOnSolidity.http.GetPaginatedNowWitnessListOnSolidityServlet;
4948
import org.tron.core.services.interfaceOnSolidity.http.GetRewardOnSolidityServlet;
5049
import org.tron.core.services.interfaceOnSolidity.http.GetTransactionCountByBlockNumOnSolidityServlet;
5150
import org.tron.core.services.interfaceOnSolidity.http.GetTransactionInfoByBlockNumOnSolidityServlet;
@@ -59,7 +58,6 @@
5958
import org.tron.core.services.interfaceOnSolidity.http.ScanShieldedTRC20NotesByIvkOnSolidityServlet;
6059
import org.tron.core.services.interfaceOnSolidity.http.ScanShieldedTRC20NotesByOvkOnSolidityServlet;
6160
import org.tron.core.services.interfaceOnSolidity.http.TriggerConstantContractOnSolidityServlet;
62-
import org.tron.core.services.interfaceOnSolidity.http.GetPaginatedNowWitnessListOnSolidityServlet;
6361

6462
@Slf4j(topic = "API")
6563
public class HttpApiOnSolidityService extends HttpService {

framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ public void testBroadcastBeforeAllowZksnark()
320320
}
321321

322322
/*
323-
* generate spendproof, dataToBeSigned, outputproof example dynamically according to the params file
323+
* generate spendproof, dataToBeSigned, outputproof
324+
* example dynamically according to the params file
324325
*/
325326
public String[] generateSpendAndOutputParams() throws ZksnarkException, BadItemException {
326327
librustzcashInitZksnarkParams();

0 commit comments

Comments
 (0)