Skip to content

Commit 3881b87

Browse files
committed
fix: pr review
1 parent bb8894a commit 3881b87

1 file changed

Lines changed: 13 additions & 28 deletions

File tree

framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.tron.core.config.args.Args;
1818
import org.tron.core.consensus.ConsensusService;
1919
import org.tron.core.consensus.ProposalController;
20+
import org.tron.core.exception.ItemNotFoundException;
2021
import org.tron.core.store.DynamicPropertiesStore;
2122
import org.tron.protos.Protocol.Proposal;
2223
import org.tron.protos.Protocol.Proposal.State;
@@ -29,7 +30,7 @@ public class ProposalControllerTest extends BaseTest {
2930
private static boolean init;
3031

3132
static {
32-
Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF);
33+
Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF);
3334
}
3435

3536
@Before
@@ -66,7 +67,7 @@ public void testSetDynamicParameters() {
6667
}
6768

6869
@Test
69-
public void testProcessProposal() {
70+
public void testProcessProposal() throws ItemNotFoundException {
7071
ProposalCapsule proposalCapsule = new ProposalCapsule(
7172
Proposal.newBuilder().build());
7273
proposalCapsule.setState(State.PENDING);
@@ -77,11 +78,7 @@ public void testProcessProposal() {
7778

7879
proposalController.processProposal(proposalCapsule);
7980

80-
try {
81-
proposalCapsule = dbManager.getProposalStore().get(key);
82-
} catch (Exception ex) {
83-
Assert.fail(ex.getMessage());
84-
}
81+
proposalCapsule = dbManager.getProposalStore().get(key);
8582
Assert.assertEquals(State.DISAPPROVED, proposalCapsule.getState());
8683

8784
proposalCapsule.setState(State.PENDING);
@@ -92,11 +89,7 @@ public void testProcessProposal() {
9289

9390
proposalController.processProposal(proposalCapsule);
9491

95-
try {
96-
proposalCapsule = dbManager.getProposalStore().get(key);
97-
} catch (Exception ex) {
98-
Assert.fail(ex.getMessage());
99-
}
92+
proposalCapsule = dbManager.getProposalStore().get(key);
10093
Assert.assertEquals(State.DISAPPROVED, proposalCapsule.getState());
10194

10295
List<ByteString> activeWitnesses = Lists.newArrayList();
@@ -114,17 +107,13 @@ public void testProcessProposal() {
114107
dbManager.getProposalStore().put(key, proposalCapsule);
115108
proposalController.processProposal(proposalCapsule);
116109

117-
try {
118-
proposalCapsule = dbManager.getProposalStore().get(key);
119-
} catch (Exception ex) {
120-
Assert.fail(ex.getMessage());
121-
}
110+
proposalCapsule = dbManager.getProposalStore().get(key);
122111
Assert.assertEquals(State.APPROVED, proposalCapsule.getState());
123112
}
124113

125114

126115
@Test
127-
public void testProcessProposals() {
116+
public void testProcessProposals() throws ItemNotFoundException {
128117
ProposalCapsule proposalCapsule1 = new ProposalCapsule(
129118
Proposal.newBuilder().build());
130119
proposalCapsule1.setState(State.APPROVED);
@@ -163,11 +152,7 @@ public void testProcessProposals() {
163152

164153
proposalController.processProposals();
165154

166-
try {
167-
proposalCapsule3 = dbManager.getProposalStore().get(proposalCapsule3.createDbKey());
168-
} catch (Exception ex) {
169-
Assert.fail(ex.getMessage());
170-
}
155+
proposalCapsule3 = dbManager.getProposalStore().get(proposalCapsule3.createDbKey());
171156
Assert.assertEquals(State.DISAPPROVED, proposalCapsule3.getState());
172157

173158
}
@@ -181,26 +166,26 @@ public void testHasMostApprovals() {
181166

182167
List<ByteString> activeWitnesses = Lists.newArrayList();
183168
for (int i = 0; i < 27; i++) {
184-
activeWitnesses.add(ByteString.copyFrom(new byte[]{(byte) i}));
169+
activeWitnesses.add(ByteString.copyFrom(new byte[] {(byte) i}));
185170
}
186171
for (int i = 0; i < 18; i++) {
187-
proposalCapsule.addApproval(ByteString.copyFrom(new byte[]{(byte) i}));
172+
proposalCapsule.addApproval(ByteString.copyFrom(new byte[] {(byte) i}));
188173
}
189174

190175
Assert.assertTrue(proposalCapsule.hasMostApprovals(activeWitnesses));
191176

192177
proposalCapsule.clearApproval();
193178
for (int i = 1; i < 18; i++) {
194-
proposalCapsule.addApproval(ByteString.copyFrom(new byte[]{(byte) i}));
179+
proposalCapsule.addApproval(ByteString.copyFrom(new byte[] {(byte) i}));
195180
}
196181

197182
activeWitnesses.clear();
198183
for (int i = 0; i < 5; i++) {
199-
activeWitnesses.add(ByteString.copyFrom(new byte[]{(byte) i}));
184+
activeWitnesses.add(ByteString.copyFrom(new byte[] {(byte) i}));
200185
}
201186
proposalCapsule.clearApproval();
202187
for (int i = 0; i < 3; i++) {
203-
proposalCapsule.addApproval(ByteString.copyFrom(new byte[]{(byte) i}));
188+
proposalCapsule.addApproval(ByteString.copyFrom(new byte[] {(byte) i}));
204189
}
205190
Assert.assertTrue(proposalCapsule.hasMostApprovals(activeWitnesses));
206191
}

0 commit comments

Comments
 (0)