Merge pull request trilitech#195 from trilitech/palmer@functori@trans…

…action-entrypoint-non-complex

Parser: set transaction entrypoint parameter to non-complex

app/src/parser/operation_parser.c

@@ -115,8 +115,8 @@ TZ_OPERATION_FIELDS(transaction_fields,
     TZ_OPERATION_FIELD("Destination", TZ_OPERATION_FIELD_DESTINATION),
     TZ_OPERATION_OPTION_FIELD("_Parameters",
         TZ_OPERATION_TUPLE_FIELD("_Parameters",
-            TZ_OPERATION_FIELD("Entrypoint", TZ_OPERATION_FIELD_SMART_ENTRYPOINT, .complex=true),
-            TZ_OPERATION_FIELD("Parameter",  TZ_OPERATION_FIELD_EXPR,             .complex=true)),
+            TZ_OPERATION_FIELD("Entrypoint", TZ_OPERATION_FIELD_SMART_ENTRYPOINT),
+            TZ_OPERATION_FIELD("Parameter",  TZ_OPERATION_FIELD_EXPR, .complex=true)),
         .display_none=false)
 );
 

tests/generate/gen_integration.ml

@@ -279,7 +279,6 @@ let operation_to_screens
           then []
           else
             [
-              need_expert_mode_screen "Entrypoint";
               make_screen ~title:"Entrypoint" "%a" Entrypoint.pp entrypoint;
               need_expert_mode_screen "Parameter";
               make_screen ~title:"Parameter" "%a" pp_lazy_expr parameters;

tests/integration/stax/test_blindsign_valid.py

@@ -49,15 +49,15 @@
     app.review.tap()
     app.assert_screen("tst_review_002")
 
-    app.review.tap()
-    app.expert_mode_splash()
-
     app.review.tap()
     app.assert_screen("tst_review_003")
+
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_splash()
+
     app.review.tap()
     app.assert_screen("tst_review_004")
+
     app.review.tap()
     app.assert_screen("operation_sign")
 

tests/integration/stax/test_expert_mode_rejections.py

@@ -31,6 +31,8 @@ def sign_transfer_initialize(app):
     app.assert_screen(f"tst_review_001")
     app.review.tap()
     app.assert_screen("tst_review_002")
+    app.review.tap()
+    app.assert_screen("tst_review_003")
 
 
 

tests/integration/stax/test_parsing_errors.py

@@ -43,8 +43,6 @@
     app.review.tap()
     app.assert_screen("tpe_review_0_02_partial")
     app.review.tap()
-    app.expert_mode_splash()
-    app.review.tap()
     app.assert_screen("tpe_review_0_03")
     app.review.tap()
     verify_err_reject_response(app, "invalid_tag")
@@ -57,11 +55,9 @@
     app.review.tap()
     app.assert_screen("tpe_review_0_02_full")
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
-    app.review.tap()
     app.assert_screen("tpe_review_0_03_full")
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_splash()
     app.review.tap()
     app.assert_screen("tpe_review_0_04_full")
     app.review.tap()

tests/integration/stax/test_sign_transfer.py

@@ -39,13 +39,10 @@
     app.assert_screen("tst_review_002")
 
     app.review.tap()
-    app.enable_expert_mode()
-
-    app.review.tap()
-    app.assert_screen("tst_expert_splash")
+    app.assert_screen("tst_review_003")
 
     app.review.tap()
-    app.assert_screen("tst_review_003")
+    app.enable_expert_mode()
 
     app.review.tap()
     app.assert_screen("tst_expert_splash")
@@ -75,9 +72,6 @@
     app.review.tap()
     app.assert_screen("tst_review_002")
 
-    app.review.tap()
-    app.assert_screen("tst_expert_splash")
-
     app.review.tap()
     app.assert_screen("tst_review_003")
 

tests/integration/stax/test_sign_transfer_without_hash.py

@@ -38,14 +38,11 @@
     app.review.tap()
     app.assert_screen("review_1")
 
-    app.review.tap()
-    app.expert_mode_splash()
-
     app.review.tap()
     app.assert_screen("review_2")
 
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_splash()
 
     app.review.tap()
     app.assert_screen("review_3")

tests/unit/ctest/tests_parser.c

@@ -253,7 +253,7 @@ CTEST2(operation_parser, check_transaction_complexity)
         {"Destination",   false, 5},
  //     {"Option",        _,     6},
   //    {"Tuple",         _,     7},
-        {"Entrypoint",    true,  8},
+        {"Entrypoint",    false, 8},
         {"Parameter",     true,  9},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
@@ -281,7 +281,7 @@ CTEST2(operation_parser, check_double_transaction_complexity)
         {"Destination",   false, 11},
  //     {"Option",        _,     12},
   //    {"Tuple",         _,     13},
-        {"Entrypoint",    true,  14},
+        {"Entrypoint",    false, 14},
         {"Parameter",     true,  15},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));