File tree Expand file tree Collapse file tree 2 files changed +3
-13
lines changed
Expand file tree Collapse file tree 2 files changed +3
-13
lines changed Original file line number Diff line number Diff line change @@ -24,11 +24,7 @@ use pb::{
2424#[ cfg( any( test, feature = "testing" ) ) ]
2525use proptest:: prelude:: * ;
2626use semver:: Version ;
27- use serde_json:: Value as JsonValue ;
28- use value:: {
29- ConvexValue ,
30- JsonPackedValue ,
31- } ;
27+ use value:: JsonPackedValue ;
3228
3329#[ cfg( any( test, feature = "testing" ) ) ]
3430use crate :: HttpActionRequest ;
@@ -97,9 +93,7 @@ impl ActionOutcome {
9793 let result = result. ok_or_else ( || anyhow:: anyhow!( "Missing result" ) ) ?;
9894 let result = match result. result {
9995 Some ( FunctionResultTypeProto :: JsonPackedValue ( value) ) => {
100- let json: JsonValue = serde_json:: from_str ( & value) ?;
101- let value = ConvexValue :: try_from ( json) ?;
102- Ok ( JsonPackedValue :: pack ( value) )
96+ Ok ( JsonPackedValue :: from_network ( value) ?)
10397 } ,
10498 Some ( FunctionResultTypeProto :: JsError ( js_error) ) => Err ( js_error. try_into ( ) ?) ,
10599 None => anyhow:: bail!( "Missing result" ) ,
Original file line number Diff line number Diff line change @@ -26,10 +26,8 @@ use proptest::prelude::Arbitrary;
2626#[ cfg( any( test, feature = "testing" ) ) ]
2727use proptest:: prelude:: Strategy ;
2828use rand:: Rng ;
29- use serde_json:: Value as JsonValue ;
3029use value:: {
3130 heap_size:: HeapSize ,
32- ConvexValue ,
3331 JsonPackedValue ,
3432} ;
3533
@@ -223,9 +221,7 @@ impl UdfOutcome {
223221 let result = result. ok_or_else ( || anyhow:: anyhow!( "Missing result" ) ) ?;
224222 let result = match result. result {
225223 Some ( FunctionResultTypeProto :: JsonPackedValue ( value) ) => {
226- let json: JsonValue = serde_json:: from_str ( & value) ?;
227- let value = ConvexValue :: try_from ( json) ?;
228- Ok ( JsonPackedValue :: pack ( value) )
224+ Ok ( JsonPackedValue :: from_network ( value) ?)
229225 } ,
230226 Some ( FunctionResultTypeProto :: JsError ( js_error) ) => Err ( js_error. try_into ( ) ?) ,
231227 None => anyhow:: bail!( "Missing result" ) ,
You can’t perform that action at this time.
0 commit comments