Skip to content

Commit bae51b0

Browse files
committed
Merge branch 'release_v4.8.1' of github.com:tronprotocol/java-tron into volatile-modifier
2 parents 017207e + 07dec0d commit bae51b0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212

1313
<p align="center">
1414
<a href="https://gitter.im/tronprotocol/allcoredev">
15-
<img src="https://camo.githubusercontent.com/da2edb525cde1455a622c58c0effc3a90b9a181c/68747470733a2f2f6261646765732e6769747465722e696d2f4a6f696e253230436861742e737667">
16-
</a>
17-
18-
<a href="https://travis-ci.org/tronprotocol/java-tron">
19-
<img src="https://travis-ci.org/tronprotocol/java-tron.svg?branch=develop">
15+
<img src="https://img.shields.io/gitter/room/tronprotocol/java-tron.svg">
2016
</a>
2117

2218
<a href="https://codecov.io/gh/tronprotocol/java-tron">

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,
324+
* outputproof example dynamically according to the params file
324325
*/
325326
public String[] generateSpendAndOutputParams() throws ZksnarkException, BadItemException {
326327
librustzcashInitZksnarkParams();

0 commit comments

Comments
 (0)