Merge remote-tracking branch 'upstream/release_v4.8.1' into feature/voting_window_period

lxcmyf · lxcmyf · commit 399d159277d7 · 2025-07-14T17:56:10.000+08:00
diff --git a/framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java b/framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java
@@ -320,7 +320,8 @@ public void testBroadcastBeforeAllowZksnark()
   }
 
   /*
-   * generate spendproof, dataToBeSigned, outputproof example dynamically according to the params file
+   * generate spendproof, dataToBeSigned,
+   * outputproof example dynamically according to the params file
    */
   public String[] generateSpendAndOutputParams() throws ZksnarkException, BadItemException {
     librustzcashInitZksnarkParams();

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,8 @@ public void testBroadcastBeforeAllowZksnark()`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`/*`
`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`
`324`	`325`	`*/`
`325`	`326`	`public String[] generateSpendAndOutputParams() throws ZksnarkException, BadItemException {`
`326`	`327`	`librustzcashInitZksnarkParams();`