merge conflict resolutions

demergent-labs · Jan 22, 2024 · d7f0708 · d7f0708
1 parent 15ff170
commit d7f0708
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/property_tests/arbitraries/http/request_arb.ts b/property_tests/arbitraries/http/request_arb.ts
@@ -81,7 +81,7 @@ export function HttpRequestArb(): fc.Arbitrary<
             value: {
                 agentArgumentValue: httpRequest,
                 agentResponseValue: httpRequest,
-                candidTypeObject: HttpRequest
+                runtimeCandidTypeObject: HttpRequest
             },
             src: {
                 candidTypeAnnotation: 'HttpRequest',

diff --git a/property_tests/arbitraries/http/response_arb.ts b/property_tests/arbitraries/http/response_arb.ts
@@ -62,7 +62,9 @@ export function HttpResponseArb<T extends CorrespondingJSType = any>(
             value: {
                 agentArgumentValue: response,
                 agentResponseValue: agentResponseValue,
-                candidTypeObject: HttpResponse(token.value.candidTypeObject)
+                runtimeCandidTypeObject: HttpResponse(
+                    token.value.runtimeCandidTypeObject
+                )
             },
             src: {
                 candidTypeAnnotation: `HttpResponse<${token.src.candidTypeAnnotation}>`,

diff --git a/property_tests/tests/canister_methods/http_request/test/generate_body.ts b/property_tests/tests/canister_methods/http_request/test/generate_body.ts
@@ -7,7 +7,8 @@ export function generateBody(
     namedParams: Named<CandidValueAndMeta<HttpRequest>>[],
     returnType: CandidValueAndMeta<CandidReturnType>
 ): string {
-    const { name: requestParamName, el: requestValueObject } = namedParams[0];
+    const { name: requestParamName, value: requestValueObject } =
+        namedParams[0];
     const request = requestValueObject.value.agentArgumentValue;
 
     const httpMethodCheck = generateHttpMethodCheck(

diff --git a/property_tests/tests/canister_methods/http_request/test/generate_tests.ts b/property_tests/tests/canister_methods/http_request/test/generate_tests.ts
@@ -14,7 +14,7 @@ export function generateTests(
         HttpResponseAgentResponseValue
     >
 ): Test[][] {
-    const request = params[0].el.value.agentArgumentValue;
+    const request = params[0].value.value.agentArgumentValue;
     const expectedResponse = returnType.value.agentResponseValue;
 
     return [