@@ -633,10 +633,10 @@ fn chainpack_to_rpcvalue(data: &str) -> Result<RpcValue, ReadError> {
633633}
634634
635635#[ cfg( test) ]
636- fn rpcvalue_to_chainpack ( value : RpcValue ) -> String {
636+ fn rpcvalue_to_chainpack ( value : & RpcValue ) -> String {
637637 let mut data = Vec :: new ( ) ;
638638 let mut wr = ChainPackWriter :: new ( & mut data) ;
639- wr. write ( & value) . expect ( "Write must work" ) ;
639+ wr. write ( value) . expect ( "Write must work" ) ;
640640 hex:: encode ( data) . to_uppercase ( )
641641}
642642
@@ -651,23 +651,23 @@ fn test_int() {
651651 assert_eq ! ( chainpack_to_rpcvalue( "82F3138083FD18A37C" ) . unwrap( ) , 5_489_328_932_823_932_i64 . into( ) ) ;
652652 assert_eq ! ( chainpack_to_rpcvalue( "82F47FFFFFFFFFFFFFFF" ) . unwrap( ) , 9_223_372_036_854_775_807_i64 . into( ) ) ;
653653
654- assert_eq ! ( rpcvalue_to_chainpack( 120_u64 . into( ) ) , "8178" ) ;
655- assert_eq ! ( rpcvalue_to_chainpack( 2_u64 . into( ) ) , "02" ) ;
656- assert_eq ! ( rpcvalue_to_chainpack( 508_u64 . into( ) ) , "8181FC" ) ;
657- assert_eq ! ( rpcvalue_to_chainpack( 1_048_570_u64 . into( ) ) , "81CFFFFA" ) ;
658- assert_eq ! ( rpcvalue_to_chainpack( 33_554_400_u64 . into( ) ) , "81E1FFFFE0" ) ;
659- assert_eq ! ( rpcvalue_to_chainpack( 5_489_328_932_823_932_i64 . into( ) ) , "82F3138083FD18A37C" ) ;
660- assert_eq ! ( rpcvalue_to_chainpack( 9_223_372_036_854_775_807_i64 . into( ) ) , "82F47FFFFFFFFFFFFFFF" ) ;
654+ assert_eq ! ( rpcvalue_to_chainpack( & 120_u64 . into( ) ) , "8178" ) ;
655+ assert_eq ! ( rpcvalue_to_chainpack( & 2_u64 . into( ) ) , "02" ) ;
656+ assert_eq ! ( rpcvalue_to_chainpack( & 508_u64 . into( ) ) , "8181FC" ) ;
657+ assert_eq ! ( rpcvalue_to_chainpack( & 1_048_570_u64 . into( ) ) , "81CFFFFA" ) ;
658+ assert_eq ! ( rpcvalue_to_chainpack( & 33_554_400_u64 . into( ) ) , "81E1FFFFE0" ) ;
659+ assert_eq ! ( rpcvalue_to_chainpack( & 5_489_328_932_823_932_i64 . into( ) ) , "82F3138083FD18A37C" ) ;
660+ assert_eq ! ( rpcvalue_to_chainpack( & 9_223_372_036_854_775_807_i64 . into( ) ) , "82F47FFFFFFFFFFFFFFF" ) ;
661661
662662 // Negative int
663663 assert_eq ! ( chainpack_to_rpcvalue( "82E9FFFFE0" ) . unwrap( ) , ( -33_554_400 ) . into( ) ) ;
664- assert_eq ! ( rpcvalue_to_chainpack( ( -33_554_400 ) . into( ) ) , "82E9FFFFE0" ) ;
664+ assert_eq ! ( rpcvalue_to_chainpack( & ( -33_554_400 ) . into( ) ) , "82E9FFFFE0" ) ;
665665}
666666
667667#[ test]
668668fn test_string ( ) {
669669 assert_eq ! ( chainpack_to_rpcvalue( "860541484F4A21" ) . unwrap( ) , "AHOJ!" . into( ) ) ;
670- assert_eq ! ( rpcvalue_to_chainpack( "AHOJ!" . into( ) ) , "860541484F4A21" ) ;
670+ assert_eq ! ( rpcvalue_to_chainpack( & "AHOJ!" . into( ) ) , "860541484F4A21" ) ;
671671
672672 // Invalid UTF-8 string
673673 assert ! ( chainpack_to_rpcvalue( "8602C328" ) . is_err( ) ) ;
@@ -676,16 +676,16 @@ fn test_string() {
676676#[ test]
677677fn test_true_false_packing_schema ( ) {
678678 assert_eq ! ( chainpack_to_rpcvalue( "FE" ) . unwrap( ) , true . into( ) ) ;
679- assert_eq ! ( rpcvalue_to_chainpack( true . into( ) ) , "FE" ) ;
679+ assert_eq ! ( rpcvalue_to_chainpack( & true . into( ) ) , "FE" ) ;
680680
681681 assert_eq ! ( chainpack_to_rpcvalue( "FD" ) . unwrap( ) , false . into( ) ) ;
682- assert_eq ! ( rpcvalue_to_chainpack( false . into( ) ) , "FD" ) ;
682+ assert_eq ! ( rpcvalue_to_chainpack( & false . into( ) ) , "FD" ) ;
683683}
684684
685685#[ test]
686686fn test_cstring ( ) {
687687 assert_eq ! ( chainpack_to_rpcvalue( "8E41484F4A2100" ) . unwrap( ) , "AHOJ!" . into( ) ) ;
688- assert_eq ! ( rpcvalue_to_chainpack( "AHOJ!" . into( ) ) , "860541484F4A21" ) ;
688+ assert_eq ! ( rpcvalue_to_chainpack( & "AHOJ!" . into( ) ) , "860541484F4A21" ) ;
689689
690690 // Invalid UTF-8 string
691691 assert ! ( chainpack_to_rpcvalue( "8EC32800" ) . is_err( ) ) ;
@@ -695,14 +695,14 @@ fn test_cstring() {
695695fn test_blob ( ) {
696696 let blob = vec ! [ 170u8 ; 10 ] ;
697697 assert_eq ! ( chainpack_to_rpcvalue( "850AAAAAAAAAAAAAAAAAAAAA" ) . unwrap( ) , blob. clone( ) . into( ) ) ;
698- assert_eq ! ( rpcvalue_to_chainpack( blob. into( ) ) , "850AAAAAAAAAAAAAAAAAAAAA" ) ;
698+ assert_eq ! ( rpcvalue_to_chainpack( & blob. into( ) ) , "850AAAAAAAAAAAAAAAAAAAAA" ) ;
699699}
700700
701701#[ test]
702702fn test_list ( ) {
703703 let list = crate :: make_list![ "a" , 123 , true , crate :: make_list![ 1 , 2 , 3 ] , RpcValue :: null( ) ] ;
704704 assert_eq ! ( chainpack_to_rpcvalue( "8886016182807BFE88414243FF80FF" ) . unwrap( ) , RpcValue :: from( list. clone( ) ) ) ;
705- assert_eq ! ( rpcvalue_to_chainpack( RpcValue :: from( list) ) , "8886016182807BFE88414243FF80FF" ) ;
705+ assert_eq ! ( rpcvalue_to_chainpack( & RpcValue :: from( list) ) , "8886016182807BFE88414243FF80FF" ) ;
706706}
707707
708708#[ test]
@@ -713,7 +713,7 @@ fn test_map() {
713713 "foo" => vec![ 11 , 12 , 13 ]
714714 } ;
715715 assert_eq ! ( chainpack_to_rpcvalue( "89860362617242860362617A438603666F6F884B4C4DFFFF" ) . unwrap( ) , map. clone( ) . into( ) ) ;
716- assert_eq ! ( rpcvalue_to_chainpack( map. into( ) ) , "89860362617242860362617A438603666F6F884B4C4DFFFF" ) ;
716+ assert_eq ! ( rpcvalue_to_chainpack( & map. into( ) ) , "89860362617242860362617A438603666F6F884B4C4DFFFF" ) ;
717717
718718 // Invalid key
719719 assert_eq ! ( chainpack_to_rpcvalue( "898200" ) . unwrap_err( ) . msg, "ChainPack read error - Invalid Map key '0'" ) ;
@@ -728,7 +728,7 @@ fn test_imap() {
728728 } ;
729729
730730 assert_eq ! ( chainpack_to_rpcvalue( "8A418603666F6F42860362617282814D4FFF" ) . unwrap( ) , imap. clone( ) . into( ) ) ;
731- assert_eq ! ( rpcvalue_to_chainpack( imap. into( ) ) , "8A418603666F6F42860362617282814D4FFF" ) ;
731+ assert_eq ! ( rpcvalue_to_chainpack( & imap. into( ) ) , "8A418603666F6F42860362617282814D4FFF" ) ;
732732
733733 // Invalid key
734734 assert_eq ! ( chainpack_to_rpcvalue( "8A8603626172" ) . unwrap_err( ) . msg, "ChainPack read error - Invalid IMap key '\" bar\" '" ) ;
@@ -755,37 +755,37 @@ fn test_datetime() {
755755 assert_eq ! ( chainpack_to_rpcvalue( "8DF182D3308815" ) . unwrap( ) , DateTime :: from_epoch_msec_tz( 1_493_832_123_000 , -5400 ) . into( ) ) ;
756756 assert_eq ! ( chainpack_to_rpcvalue( "8DF1961334BEB4" ) . unwrap( ) , DateTime :: from_epoch_msec_tz( 1_493_826_723_923 , 0 ) . into( ) ) ;
757757
758- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_517_529_600_001 , 0 ) . into( ) ) , "8D04" ) ;
759- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_517_529_600_001 , 3600 ) . into( ) ) , "8D8211" ) ;
760- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_543_708_800_000 , 0 ) . into( ) ) , "8DE63DDA02" ) ;
761- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_514_764_800_000 , 0 ) . into( ) ) , "8DE8A8BFFE" ) ;
762- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_546_300_800_000 , 0 ) . into( ) ) , "8DE6DC0E02" ) ;
763- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_577_836_800_000 , 0 ) . into( ) ) , "8DF00E60DC02" ) ;
764- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_609_459_200_000 , 0 ) . into( ) ) , "8DF015EAF002" ) ;
765- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_924_992_000_000 , 0 ) . into( ) ) , "8DF061258802" ) ;
766- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 2_240_611_200_000 , 0 ) . into( ) ) , "8DF100AC656602" ) ;
767- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 2_246_004_900_000 , -36900 ) . into( ) ) , "8DF156D74D495F" ) ;
768- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 2_246_004_900_123 , -36900 ) . into( ) ) , "8DF301533905E2375D" ) ;
769- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 0 , 0 ) . into( ) ) , "8DF18169CEA7FE" ) ;
770- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_790_723_000 , 0 ) . into( ) ) , "8DEDA8E7F2" ) ;
771- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_826_723_923 , 0 ) . into( ) ) , "8DF1961334BEB4" ) ;
772- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_790_751_123 , 36000 ) . into( ) ) , "8DF28B0DE42CD95F" ) ;
773- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_826_723_000 , 0 ) . into( ) ) , "8DEDA6B572" ) ;
774- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_832_123_000 , -5400 ) . into( ) ) , "8DF182D3308815" ) ;
775- assert_eq ! ( rpcvalue_to_chainpack( DateTime :: from_epoch_msec_tz( 1_493_826_723_923 , 0 ) . into( ) ) , "8DF1961334BEB4" ) ;
758+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_517_529_600_001 , 0 ) . into( ) ) , "8D04" ) ;
759+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_517_529_600_001 , 3600 ) . into( ) ) , "8D8211" ) ;
760+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_543_708_800_000 , 0 ) . into( ) ) , "8DE63DDA02" ) ;
761+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_514_764_800_000 , 0 ) . into( ) ) , "8DE8A8BFFE" ) ;
762+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_546_300_800_000 , 0 ) . into( ) ) , "8DE6DC0E02" ) ;
763+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_577_836_800_000 , 0 ) . into( ) ) , "8DF00E60DC02" ) ;
764+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_609_459_200_000 , 0 ) . into( ) ) , "8DF015EAF002" ) ;
765+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_924_992_000_000 , 0 ) . into( ) ) , "8DF061258802" ) ;
766+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 2_240_611_200_000 , 0 ) . into( ) ) , "8DF100AC656602" ) ;
767+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 2_246_004_900_000 , -36900 ) . into( ) ) , "8DF156D74D495F" ) ;
768+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 2_246_004_900_123 , -36900 ) . into( ) ) , "8DF301533905E2375D" ) ;
769+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 0 , 0 ) . into( ) ) , "8DF18169CEA7FE" ) ;
770+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_790_723_000 , 0 ) . into( ) ) , "8DEDA8E7F2" ) ;
771+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_826_723_923 , 0 ) . into( ) ) , "8DF1961334BEB4" ) ;
772+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_790_751_123 , 36000 ) . into( ) ) , "8DF28B0DE42CD95F" ) ;
773+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_826_723_000 , 0 ) . into( ) ) , "8DEDA6B572" ) ;
774+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_832_123_000 , -5400 ) . into( ) ) , "8DF182D3308815" ) ;
775+ assert_eq ! ( rpcvalue_to_chainpack( & DateTime :: from_epoch_msec_tz( 1_493_826_723_923 , 0 ) . into( ) ) , "8DF1961334BEB4" ) ;
776776}
777777
778778#[ test]
779779fn test_double ( ) {
780780 assert_eq ! ( chainpack_to_rpcvalue( "830000000000C208B8" ) . unwrap( ) , RpcValue :: from( -9.094_583_978_896_067E-39_f64 ) ) ;
781- assert_eq ! ( rpcvalue_to_chainpack( RpcValue :: from( -9.094_583_978_896_067E-39_f64 ) ) , "830000000000C208B8" ) ;
781+ assert_eq ! ( rpcvalue_to_chainpack( & RpcValue :: from( -9.094_583_978_896_067E-39_f64 ) ) , "830000000000C208B8" ) ;
782782}
783783
784784#[ test]
785785fn test_decimal ( ) {
786786 let dec = crate :: decimal:: Decimal :: new ( 0 , 0 ) ;
787787 assert_eq ! ( chainpack_to_rpcvalue( "8C0000" ) . unwrap( ) , dec. into( ) ) ;
788- assert_eq ! ( rpcvalue_to_chainpack( dec. into( ) ) , "8C0000" ) ;
788+ assert_eq ! ( rpcvalue_to_chainpack( & dec. into( ) ) , "8C0000" ) ;
789789}
790790
791791#[ test]
0 commit comments