@@ -9,15 +9,15 @@ mod errors;
9
9
use errors:: Error ;
10
10
11
11
#[ no_mangle]
12
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_peerDASContextNew (
12
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_peerDASContextNew (
13
13
_env : JNIEnv ,
14
14
_class : JClass ,
15
15
) -> jlong {
16
16
c_peerdas_kzg:: peerdas_context_new ( ) as jlong
17
17
}
18
18
19
19
#[ no_mangle]
20
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_peerDASContextDestroy (
20
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_peerDASContextDestroy (
21
21
_env : JNIEnv ,
22
22
_class : JClass ,
23
23
ctx_ptr : jlong ,
@@ -26,20 +26,18 @@ pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_peerDASCo
26
26
}
27
27
28
28
#[ no_mangle]
29
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_computeCellsAndKZGProofs <
30
- ' local ,
31
- > (
29
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_computeCellsAndKZGProofs < ' local > (
32
30
mut env : JNIEnv < ' local > ,
33
31
_class : JClass ,
34
32
ctx_ptr : jlong ,
35
33
blob : JByteArray < ' local > ,
36
34
) -> JObject < ' local > {
37
- let ctx = & * ( ctx_ptr as * const PeerDASContext ) ;
35
+ let ctx = unsafe { & * ( ctx_ptr as * const PeerDASContext ) } ;
38
36
match compute_cells_and_kzg_proofs ( & mut env, ctx, blob) {
39
37
Ok ( cells_and_proofs) => cells_and_proofs,
40
38
Err ( err) => {
41
39
throw_on_error ( & mut env, err, "computeCellsAndKZGProofs" ) ;
42
- return JObject :: default ( ) ;
40
+ JObject :: default ( )
43
41
}
44
42
}
45
43
}
@@ -54,20 +52,18 @@ fn compute_cells_and_kzg_proofs<'local>(
54
52
}
55
53
56
54
#[ no_mangle]
57
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_blobToKZGCommitment <
58
- ' local ,
59
- > (
55
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_blobToKZGCommitment < ' local > (
60
56
mut env : JNIEnv < ' local > ,
61
57
_class : JClass ,
62
58
ctx_ptr : jlong ,
63
59
blob : JByteArray < ' local > ,
64
60
) -> JByteArray < ' local > {
65
- let ctx = & * ( ctx_ptr as * const PeerDASContext ) ;
61
+ let ctx = unsafe { & * ( ctx_ptr as * const PeerDASContext ) } ;
66
62
match blob_to_kzg_commitment ( & mut env, ctx, blob) {
67
63
Ok ( commitment) => commitment,
68
64
Err ( err) => {
69
65
throw_on_error ( & mut env, err, "blobToKZGCommitment" ) ;
70
- return JByteArray :: default ( ) ;
66
+ JByteArray :: default ( )
71
67
}
72
68
}
73
69
}
@@ -82,9 +78,7 @@ fn blob_to_kzg_commitment<'local>(
82
78
}
83
79
84
80
#[ no_mangle]
85
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCellKZGProof <
86
- ' local ,
87
- > (
81
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCellKZGProof < ' local > (
88
82
mut env : JNIEnv < ' local > ,
89
83
_class : JClass ,
90
84
ctx_ptr : jlong ,
@@ -93,13 +87,13 @@ pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCel
93
87
cell : JByteArray < ' local > ,
94
88
proof_bytes : JByteArray < ' local > ,
95
89
) -> jboolean {
96
- let ctx = & * ( ctx_ptr as * const PeerDASContext ) ;
90
+ let ctx = unsafe { & * ( ctx_ptr as * const PeerDASContext ) } ;
97
91
98
92
match verify_cell_kzg_proof ( & mut env, ctx, commitment_bytes, cell_id, cell, proof_bytes) {
99
93
Ok ( result) => result,
100
94
Err ( err) => {
101
95
throw_on_error ( & mut env, err, "verifyCellKZGProof" ) ;
102
- return jboolean:: default ( ) ;
96
+ jboolean:: default ( )
103
97
}
104
98
}
105
99
}
@@ -122,14 +116,12 @@ fn verify_cell_kzg_proof(
122
116
{
123
117
Ok ( _) => Ok ( jboolean:: from ( true ) ) ,
124
118
Err ( VerifierError :: InvalidProof ) => Ok ( jboolean:: from ( false ) ) ,
125
- Err ( err) => Err ( Error :: VerifierError ( err) ) ,
119
+ Err ( err) => Err ( Error :: Verifier ( err) ) ,
126
120
}
127
121
}
128
122
129
123
#[ no_mangle]
130
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCellKZGProofBatch <
131
- ' local ,
132
- > (
124
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCellKZGProofBatch < ' local > (
133
125
mut env : JNIEnv < ' local > ,
134
126
_class : JClass ,
135
127
ctx_ptr : jlong ,
@@ -139,7 +131,7 @@ pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCel
139
131
cells : JObjectArray < ' local > ,
140
132
proofs : JObjectArray < ' local > ,
141
133
) -> jboolean {
142
- let ctx = & * ( ctx_ptr as * const PeerDASContext ) ;
134
+ let ctx = unsafe { & * ( ctx_ptr as * const PeerDASContext ) } ;
143
135
144
136
match verify_cell_kzg_proof_batch (
145
137
& mut env,
@@ -153,7 +145,7 @@ pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_verifyCel
153
145
Ok ( result) => result,
154
146
Err ( err) => {
155
147
throw_on_error ( & mut env, err, "verifyCellKZGProofBatch" ) ;
156
- return jboolean:: default ( ) ;
148
+ jboolean:: default ( )
157
149
}
158
150
}
159
151
}
@@ -181,27 +173,25 @@ fn verify_cell_kzg_proof_batch<'local>(
181
173
) {
182
174
Ok ( _) => Ok ( jboolean:: from ( true ) ) ,
183
175
Err ( VerifierError :: InvalidProof ) => Ok ( jboolean:: from ( false ) ) ,
184
- Err ( err) => Err ( Error :: VerifierError ( err) ) ,
176
+ Err ( err) => Err ( Error :: Verifier ( err) ) ,
185
177
}
186
178
}
187
179
188
180
#[ no_mangle]
189
- pub unsafe extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_recoverCellsAndProof <
190
- ' local ,
191
- > (
181
+ pub extern "system" fn Java_ethereum_cryptography_LibPeerDASKZG_recoverCellsAndProof < ' local > (
192
182
mut env : JNIEnv < ' local > ,
193
183
_class : JClass ,
194
184
ctx_ptr : jlong ,
195
185
cell_ids : JLongArray ,
196
186
cells : JObjectArray < ' local > ,
197
187
) -> JObject < ' local > {
198
- let ctx = & * ( ctx_ptr as * const PeerDASContext ) ;
188
+ let ctx = unsafe { & * ( ctx_ptr as * const PeerDASContext ) } ;
199
189
200
190
match recover_cells_and_kzg_proofs ( & mut env, ctx, cell_ids, cells) {
201
191
Ok ( cells_and_proofs) => cells_and_proofs,
202
192
Err ( err) => {
203
193
throw_on_error ( & mut env, err, "recoverCellsAndProof" ) ;
204
- return JObject :: default ( ) ;
194
+ JObject :: default ( )
205
195
}
206
196
}
207
197
}
@@ -288,7 +278,7 @@ fn cells_and_proofs_to_jobject<'local>(
288
278
env. new_byte_array ( 0 ) ?,
289
279
) ?;
290
280
291
- for ( i, cell) in cells. into_iter ( ) . enumerate ( ) {
281
+ for ( i, cell) in cells. iter ( ) . enumerate ( ) {
292
282
let cell_array = env. byte_array_from_slice ( cell. as_ref ( ) ) ?;
293
283
env. set_object_array_element ( & cells_array, i as i32 , cell_array) ?;
294
284
}
@@ -300,7 +290,7 @@ fn cells_and_proofs_to_jobject<'local>(
300
290
env. new_byte_array ( 0 ) ?,
301
291
) ?;
302
292
303
- for ( i, proof) in proofs. into_iter ( ) . enumerate ( ) {
293
+ for ( i, proof) in proofs. iter ( ) . enumerate ( ) {
304
294
let proof_array = env. byte_array_from_slice ( proof. as_ref ( ) ) ?;
305
295
env. set_object_array_element ( & proofs_array, i as i32 , proof_array) ?;
306
296
}
@@ -319,8 +309,8 @@ fn cells_and_proofs_to_jobject<'local>(
319
309
fn throw_on_error ( env : & mut JNIEnv , err : Error , func_name : & ' static str ) {
320
310
let reason = match err {
321
311
Error :: Jni ( err) => format ! ( "{:?}" , err) ,
322
- Error :: ProverError ( err) => format ! ( "{:?}" , err) ,
323
- Error :: VerifierError ( err) => format ! ( "{:?}" , err) ,
312
+ Error :: Prover ( err) => format ! ( "{:?}" , err) ,
313
+ Error :: Verifier ( err) => format ! ( "{:?}" , err) ,
324
314
} ;
325
315
let msg = format ! (
326
316
"function {} has thrown an exception, with reason: {}" ,
0 commit comments