Skip to content

Commit 829b0cf

Browse files
committed
reduce the initZksnarkParams only once
1 parent 7676699 commit 829b0cf

12 files changed

Lines changed: 85 additions & 39 deletions

framework/build.gradle

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,22 @@ test {
123123
destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
124124
classDumpDir = file("$buildDir/jacoco/classpathdumps")
125125
}
126+
127+
exclude '**/ShieldedTRC20BuilderTest.class'
128+
exclude '**/PrecompiledContractsVerifyProofTest.class'
129+
exclude '**/ShieldedTransferActuatorTest.class'
130+
exclude '**/ShieldWalletTest.class'
131+
exclude '**/LibrustzcashTest.class'
132+
exclude '**/SaplingNoteTest.class'
133+
exclude '**/SendCoinShieldTest.class'
134+
exclude '**/ShieldedReceiveTest.class'
135+
126136
if (isWindows()) {
127-
exclude '**/ShieldedTransferActuatorTest.class'
128137
exclude '**/BackupDbUtilTest.class'
129138
exclude '**/ManagerTest.class'
130139
exclude 'org/tron/core/zksnark/**'
131-
exclude 'org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.class'
132-
exclude 'org/tron/core/ShieldedTRC20BuilderTest.class'
133140
exclude 'org/tron/common/runtime/vm/WithdrawRewardTest.class'
141+
exclude 'org/tron/core/ZkSnarkTestsSuite.class'
134142
}
135143
maxHeapSize = "1024m"
136144
doFirst {

framework/src/test/java/org/tron/common/BaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.tron.core.db.Manager;
2727
import org.tron.core.exception.BalanceInsufficientException;
2828
import org.tron.core.store.AccountStore;
29+
import org.tron.core.zen.ZksnarkInitService;
2930
import org.tron.protos.Protocol;
3031

3132
@Slf4j
@@ -47,7 +48,6 @@ public abstract class BaseTest {
4748

4849
private static Application appT1;
4950

50-
5151
@PostConstruct
5252
private void prepare() {
5353
appT1 = appT;

framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
import org.tron.core.zen.address.PaymentAddress;
4242
import org.tron.core.zen.address.SpendingKey;
4343
import org.tron.core.zen.note.Note;
44+
import org.tron.core.zksnark.ZkSnarkTest;
4445
import org.tron.keystore.Wallet;
4546
import org.tron.protos.contract.ShieldContract;
4647

4748
@Slf4j
48-
public class PrecompiledContractsVerifyProofTest extends BaseTest {
49+
public class PrecompiledContractsVerifyProofTest extends ZkSnarkTest {
4950

5051
private static final String SHIELDED_CONTRACT_ADDRESS_STR = "TGAmX5AqVUoXCf8MoHxbuhQPmhGfWTnEgA";
5152
private static byte[] SHIELDED_CONTRACT_ADDRESS;
@@ -65,7 +66,6 @@ public static void init() {
6566
.fromHexString("030c8c2bc59fb3eb8afb047a8ea4b028743d23e7d38c6fa30908358431e2314d");
6667
SHIELDED_CONTRACT_ADDRESS = WalletClient.decodeFromBase58Check(SHIELDED_CONTRACT_ADDRESS_STR);
6768
PUBLIC_TO_ADDRESS = WalletClient.decodeFromBase58Check(PUBLIC_TO_ADDRESS_STR);
68-
ZksnarkInitService.librustzcashInitZksnarkParams();
6969
}
7070

7171
@Test

framework/src/test/java/org/tron/core/ShieldWalletTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static org.mockito.Mockito.doReturn;
44
import static org.mockito.Mockito.spy;
5-
import static org.tron.core.zen.ZksnarkInitService.librustzcashInitZksnarkParams;
65

76
import java.math.BigInteger;
87
import javax.annotation.Resource;
@@ -15,25 +14,24 @@
1514
import org.tron.api.GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk;
1615
import org.tron.api.GrpcAPI.ShieldedAddressInfo;
1716
import org.tron.api.GrpcAPI.ShieldedTRC20Parameters;
18-
import org.tron.common.BaseTest;
1917
import org.tron.common.utils.ByteArray;
2018
import org.tron.core.capsule.TransactionCapsule;
2119
import org.tron.core.config.args.Args;
2220
import org.tron.core.exception.ContractExeException;
2321
import org.tron.core.exception.ContractValidateException;
2422
import org.tron.core.services.http.JsonFormat;
2523
import org.tron.core.services.http.JsonFormat.ParseException;
24+
import org.tron.core.zksnark.ZkSnarkTest;
2625

2726

28-
public class ShieldWalletTest extends BaseTest {
27+
public class ShieldWalletTest extends ZkSnarkTest {
2928

3029
@Resource
3130
private Wallet wallet;
3231

3332
@BeforeClass
3433
public static void init() {
3534
Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF);
36-
librustzcashInitZksnarkParams();
3735
}
3836

3937
@Test

framework/src/test/java/org/tron/core/ShieldedTRC20BuilderTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@
4747
import org.tron.core.zen.address.PaymentAddress;
4848
import org.tron.core.zen.address.SpendingKey;
4949
import org.tron.core.zen.note.Note;
50+
import org.tron.core.zksnark.ZkSnarkTest;
5051
import org.tron.protos.contract.ShieldContract;
5152
import org.tron.protos.contract.ShieldContract.SpendDescription;
5253

5354
@Slf4j
54-
public class ShieldedTRC20BuilderTest extends BaseTest {
55+
public class ShieldedTRC20BuilderTest extends ZkSnarkTest {
5556
@Resource
5657
private Wallet wallet;
5758
private String priKey = PublicMethod.getRandomPrivateKey();
@@ -73,11 +74,6 @@ public class ShieldedTRC20BuilderTest extends BaseTest {
7374
VerifyTransferProof transferContract = new VerifyTransferProof();
7475
VerifyBurnProof burnContract = new VerifyBurnProof();
7576

76-
@BeforeClass
77-
public static void initZksnarkParams() {
78-
ZksnarkInitService.librustzcashInitZksnarkParams();
79-
}
80-
8177
@Ignore
8278
@Test
8379
public void createShieldedContractParametersForMint()
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.tron.core;
2+
3+
import org.junit.runner.RunWith;
4+
import org.junit.runners.Suite;
5+
import org.tron.common.runtime.vm.PrecompiledContractsVerifyProofTest;
6+
import org.tron.core.actuator.ShieldedTransferActuatorTest;
7+
import org.tron.core.zksnark.LibrustzcashTest;
8+
import org.tron.core.zksnark.SaplingNoteTest;
9+
import org.tron.core.zksnark.SendCoinShieldTest;
10+
import org.tron.core.zksnark.ShieldedReceiveTest;
11+
12+
@RunWith(Suite.class)
13+
@Suite.SuiteClasses({
14+
ShieldedTRC20BuilderTest.class,
15+
PrecompiledContractsVerifyProofTest.class,
16+
ShieldedTransferActuatorTest.class,
17+
ShieldWalletTest.class,
18+
LibrustzcashTest.class,
19+
SaplingNoteTest.class,
20+
SendCoinShieldTest.class,
21+
ShieldedReceiveTest.class
22+
})
23+
public class ZkSnarkTestsSuite {
24+
25+
}

framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@
3636
import org.tron.core.zen.address.PaymentAddress;
3737
import org.tron.core.zen.address.SpendingKey;
3838
import org.tron.core.zen.note.Note;
39+
import org.tron.core.zksnark.ZkSnarkTest;
3940
import org.tron.protos.Protocol.AccountType;
4041
import org.tron.protos.Protocol.Transaction.Contract;
4142
import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract;
4243
import org.tron.protos.contract.ShieldContract.PedersenHash;
4344
import org.tron.protos.contract.ShieldContract.ShieldedTransferContract;
4445

4546
@Slf4j
46-
public class ShieldedTransferActuatorTest extends BaseTest {
47+
public class ShieldedTransferActuatorTest extends ZkSnarkTest {
4748

4849
private static final String PUBLIC_ADDRESS_ONE;
4950
private static final String ADDRESS_ONE_PRIVATE_KEY;
@@ -86,11 +87,6 @@ public class ShieldedTransferActuatorTest extends BaseTest {
8687
@BeforeClass
8788
public static void init() throws ZksnarkException {
8889
Args.getInstance().setAllowShieldedTransactionApi(true);
89-
librustzcashInitZksnarkParams();
90-
}
91-
92-
private static void librustzcashInitZksnarkParams() {
93-
ZksnarkInitService.librustzcashInitZksnarkParams();
9490
}
9591

9692
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
import org.tron.protos.contract.ShieldContract.PedersenHash;
6868

6969
@Slf4j
70-
public class LibrustzcashTest extends BaseTest {
70+
public class LibrustzcashTest extends ZkSnarkTest {
7171
private static final String dbDirectory = "db_Librustzcash_test";
7272
private static final String indexDirectory = "index_Librustzcash_test";
7373
@Resource
@@ -85,7 +85,6 @@ public static void init() {
8585
"config-test-mainnet.conf"
8686
);
8787
Args.getInstance().setAllowShieldedTransactionApi(true);
88-
ZksnarkInitService.librustzcashInitZksnarkParams();
8988
}
9089

9190
private static int randomInt(int minInt, int maxInt) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
import org.junit.BeforeClass;
99
import org.junit.Test;
1010
import org.tron.common.utils.ByteArray;
11+
import org.tron.core.Constant;
1112
import org.tron.core.config.args.Args;
1213
import org.tron.core.exception.BadItemException;
1314
import org.tron.core.exception.ZksnarkException;
14-
import org.tron.core.zen.ZksnarkInitService;
1515
import org.tron.core.zen.address.DiversifierT;
1616
import org.tron.core.zen.address.PaymentAddress;
1717
import org.tron.core.zen.address.SpendingKey;
1818
import org.tron.core.zen.note.Note;
1919

2020

21-
public class SaplingNoteTest {
21+
public class SaplingNoteTest extends ZkSnarkTest {
2222

2323
@BeforeClass
2424
public static void init() {
25+
Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF);
2526
Args.getInstance().setAllowShieldedTransactionApi(true);
2627
// Args.getInstance().setAllowShieldedTransaction(1);
27-
ZksnarkInitService.librustzcashInitZksnarkParams();
2828
}
2929

3030
@AfterClass

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
import org.tron.protos.contract.ShieldContract.SpendDescription;
9191

9292
@Slf4j
93-
public class SendCoinShieldTest extends BaseTest {
93+
public class SendCoinShieldTest extends ZkSnarkTest {
9494

9595
public static final long totalBalance = 1000_0000_000_000L;
9696
private static final byte[] DEFAULT_OVK;
@@ -119,11 +119,6 @@ public class SendCoinShieldTest extends BaseTest {
119119
.fromHexString("030c8c2bc59fb3eb8afb047a8ea4b028743d23e7d38c6fa30908358431e2314d");
120120
}
121121

122-
@BeforeClass
123-
public static void initZksnarkParams() {
124-
ZksnarkInitService.librustzcashInitZksnarkParams();
125-
}
126-
127122
/**
128123
* Init data.
129124
*/

0 commit comments

Comments
 (0)