@@ -206,7 +206,7 @@ impl TasmObject for XFieldElement {
206
206
. next_tuple ( )
207
207
. ok_or ( BFieldCodecError :: SequenceTooShort ) ?;
208
208
209
- Ok ( Box :: new ( XFieldElement :: new ( [ c_0, c_1, c_2] ) ) )
209
+ Ok ( Box :: new ( xfe ! ( [ c_0, c_1, c_2] ) ) )
210
210
}
211
211
}
212
212
@@ -242,7 +242,7 @@ impl TasmObject for bool {
242
242
match the_bool. value ( ) {
243
243
0 => Ok ( Box :: new ( false ) ) ,
244
244
1 => Ok ( Box :: new ( true ) ) ,
245
- _ => Err ( Box :: new ( BFieldCodecError :: SequenceTooShort ) ) ,
245
+ _ => Err ( Box :: new ( BFieldCodecError :: ElementOutOfRange ) ) ,
246
246
}
247
247
}
248
248
}
@@ -281,11 +281,7 @@ impl TasmObject for u64 {
281
281
. next_tuple ( )
282
282
. ok_or ( BFieldCodecError :: SequenceTooShort ) ?;
283
283
284
- let too_big = |_| BFieldCodecError :: ElementOutOfRange ;
285
- let val_lo = u64:: from ( u32:: try_from ( val_lo) . map_err ( too_big) ?) ;
286
- let val_hi = u64:: from ( u32:: try_from ( val_hi) . map_err ( too_big) ?) ;
287
-
288
- Ok ( Box :: new ( ( val_hi << 32 ) + val_lo) )
284
+ Ok ( Self :: decode ( & [ val_lo, val_hi] ) ?)
289
285
}
290
286
}
291
287
@@ -299,17 +295,11 @@ impl TasmObject for u128 {
299
295
}
300
296
301
297
fn decode_iter < Itr : Iterator < Item = BFieldElement > > ( iterator : & mut Itr ) -> Result < Box < Self > > {
302
- let ( lolo , lohi , hilo , hihi ) = iterator
298
+ let ( lo_lo , lo_hi , hi_lo , hi_hi ) = iterator
303
299
. next_tuple ( )
304
300
. ok_or ( BFieldCodecError :: SequenceTooShort ) ?;
305
301
306
- let too_big = |_| BFieldCodecError :: ElementOutOfRange ;
307
- let lolo = u128:: from ( u32:: try_from ( lolo) . map_err ( too_big) ?) ;
308
- let lohi = u128:: from ( u32:: try_from ( lohi) . map_err ( too_big) ?) ;
309
- let hilo = u128:: from ( u32:: try_from ( hilo) . map_err ( too_big) ?) ;
310
- let hihi = u128:: from ( u32:: try_from ( hihi) . map_err ( too_big) ?) ;
311
-
312
- Ok ( Box :: new ( ( hihi << 96 ) + ( hilo << 64 ) + ( lohi << 32 ) + lolo) )
302
+ Ok ( Self :: decode ( & [ lo_lo, lo_hi, hi_lo, hi_hi] ) ?)
313
303
}
314
304
}
315
305
@@ -430,7 +420,7 @@ impl TasmObject for Polynomial<'_, XFieldElement> {
430
420
pop 1
431
421
// _ list_length field_size
432
422
433
- push { Polynomial :: < XFieldElement > :: MAX_OFFSET }
423
+ push { Self :: MAX_OFFSET }
434
424
dup 1
435
425
lt
436
426
assert
0 commit comments