diff --git a/.gitlab/ci/Makefile b/.gitlab/ci/Makefile index fb1c4494eddac6ab80538e9e1defb63eb9447b1e..a92c4fc0d8f308397a59b7509eec6e97a71c8faa 100644 --- a/.gitlab/ci/Makefile +++ b/.gitlab/ci/Makefile @@ -13,13 +13,6 @@ test-protocol-compiles: cd ${CI_PROJECT_DIR} && \ dune build @runtest_compile_protocol -.PHONY: test-static-binaries -test-static-binaries: - cd ${CI_PROJECT_DIR}/tests_python && \ - sudo cp -a ../octez-binaries/x86_64/* ../ && \ - $(MAKE) -C ../ build-parameters && \ - poetry run pytest "tests_alpha/test_basic.py" -m "not slow" --exitfirst --color=yes --log-dir=tmp "--junitxml=reports/alpha_batch.xml" --timeout 7200 - .PHONY: test-pytest test-pytest: ifndef CI_NODE_INDEX diff --git a/.gitlab/ci/jobs/test/python_integration_tests.yml b/.gitlab/ci/jobs/test/python_integration_tests.yml index fc2e4a979bf8033831c94815655e0103bd21cc6a..3f5d869ced581f642f46c9f0c6c189a69bb71bf2 100644 --- a/.gitlab/ci/jobs/test/python_integration_tests.yml +++ b/.gitlab/ci/jobs/test/python_integration_tests.yml @@ -4,17 +4,6 @@ include: .gitlab/ci/jobs/test/common.yml -integration:static-binaries: - extends: - - .pytest_template - allow_failure: true - needs: - - build:static-x86_64-linux-binaries - dependencies: - - build:static-x86_64-linux-binaries - script: - - make -C ${CI_PROJECT_DIR}/.gitlab/ci test-static-binaries - integration:pytest: extends: - .pytest_integration @@ -33,4 +22,4 @@ integration:pytest_check_unknown_regression_files: extends: - .pytest_template script: - - make -C ${CI_PROJECT_DIR}/.gitlab/ci test-pytest-check-regression-files \ No newline at end of file + - make -C ${CI_PROJECT_DIR}/.gitlab/ci test-pytest-check-regression-files diff --git a/docs/Makefile b/docs/Makefile index b88746a64e0912c41a97fb0a51f786d28a91f379..4f20f44a1906976a37fb857b0a43324831e6b610 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -20,7 +20,7 @@ PROTOCOLS = $(NAMED_PROTOS) alpha # The following variables names are lowercase, so their names can be computed # from the names of the corresponding protocol directories lima_long = PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW -mumbai_long = PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc +mumbai_long = PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1 alpha_long = ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK lima_short = PtLimaPt diff --git a/docs/doc_gen/rpc_doc.ml b/docs/doc_gen/rpc_doc.ml index 6c10d89e5beb4438fb03f283af57edba8c6d528a..c40116a10f26f8d0010fe33cd5414b285c79ebc2 100644 --- a/docs/doc_gen/rpc_doc.ml +++ b/docs/doc_gen/rpc_doc.ml @@ -40,7 +40,7 @@ let protocols = ( "mumbai", "Mumbai", Some "/include/rpc_introduction.rst.inc", - "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc" ); + "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1" ); ] let pp_name ppf = function diff --git a/docs/mumbai/rpc.rst b/docs/mumbai/rpc.rst index 7a5f8c6880f4cf3b7b02d750e7b00659d2c970d6..f2081d03d92e213583d4ad87ac37210fd4867e55 100644 --- a/docs/mumbai/rpc.rst +++ b/docs/mumbai/rpc.rst @@ -319,7 +319,7 @@ Protocol Mumbai
-    { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+    { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "header": $raw_block_header,
@@ -2854,8 +2854,8 @@ Protocol Mumbai
       /* A block identifier (Base58Check-encoded) */
       $unistring
     $block_header_metadata:
-      { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
-        "next_protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+      { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
+        "next_protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -2963,7 +2963,7 @@ Protocol Mumbai
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+        "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -2971,14 +2971,14 @@ Protocol Mumbai
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+           "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $016-PtMumbai.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+           "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -2986,7 +2986,7 @@ Protocol Mumbai
              [ $016-PtMumbai.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+           "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -23793,7 +23793,7 @@ Protocol Mumbai
     { /* Shell header
          Block header's shell-related content. It contains information such as
          the block level, its predecessor and timestamp. */
-      "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+      "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "level": integer ∈ [-2^31-1, 2^31],
@@ -23923,7 +23923,7 @@ Protocol Mumbai
             
-    { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+    { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
       "payload_hash": $value_hash,
       "payload_round": integer ∈ [-2^31-1, 2^31],
       "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -24312,7 +24312,7 @@ Protocol Mumbai
   
     { "protocol_data":
-        { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+        { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
           "payload_hash": $value_hash,
           "payload_round": integer ∈ [-2^31-1, 2^31],
           "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -25077,7 +25077,7 @@ Protocol Mumbai
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+      { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
         "branch": $block_hash,
         "contents": [ $016-PtMumbai.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
@@ -28687,7 +28687,7 @@ Protocol Mumbai
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
+      { "protocol": "PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
         "branch": $block_hash,
         "contents": [ $016-PtMumbai.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
@@ -39961,8 +39961,8 @@ Protocol Mumbai