From 8e77382a6138c28c8f67e86fbf50442b1cbfd4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Thu, 15 Mar 2018 15:15:55 +0100
Subject: [PATCH] Alpha: remove constant `max_number_of_operations`

---
 .../lib_protocol/src/alpha_context.mli            |  1 -
 .../lib_protocol/src/constants_repr.ml            | 15 ++-------------
 .../lib_protocol/src/constants_storage.ml         |  3 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.mli b/src/proto_alpha/lib_protocol/src/alpha_context.mli
index 0fad57539..412415ea2 100644
--- a/src/proto_alpha/lib_protocol/src/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/src/alpha_context.mli
@@ -275,7 +275,6 @@ module Constants : sig
   val max_gas: context -> int
   val proof_of_work_threshold: context -> int64
   val dictator_pubkey: context -> Ed25519.Public_key.t
-  val max_number_of_operations: context -> int list
   val max_operation_data_length: context -> int
   val token_per_rolls: context -> Tez.t
   val michelson_maximum_type_size: context -> int
diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml
index 5b34f9d50..356ed52b0 100644
--- a/src/proto_alpha/lib_protocol/src/constants_repr.ml
+++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml
@@ -57,7 +57,6 @@ type constants = {
   proof_of_work_threshold: int64 ;
   bootstrap_keys: Ed25519.Public_key.t list ;
   dictator_pubkey: Ed25519.Public_key.t ;
-  max_number_of_operations: int list ;
   max_operation_data_length: int ;
   token_per_rolls: Tez_repr.t ;
   michelson_maximum_type_size: int;
@@ -89,8 +88,6 @@ let default = {
   dictator_pubkey =
     read_public_key
       "4d5373455738070434f214826d301a1c206780d7f789fcbf94c2149b2e0718cc" ;
-  max_number_of_operations =
-    [ 300 ] ;
   max_operation_data_length =
     16 * 1024 ; (* 16kB *)
   token_per_rolls =
@@ -149,9 +146,6 @@ let constants_encoding =
        and dictator_pubkey =
          opt Ed25519.Public_key.(=)
            default.dictator_pubkey c.dictator_pubkey
-       and max_number_of_operations =
-         opt CompareListInt.(=)
-           default.max_number_of_operations c.max_number_of_operations
        and max_operation_data_length =
          opt Compare.Int.(=)
            default.max_operation_data_length c.max_operation_data_length
@@ -174,7 +168,6 @@ let constants_encoding =
          ( proof_of_work_threshold,
            bootstrap_keys,
            dictator_pubkey,
-           max_number_of_operations,
            max_operation_data_length,
            token_per_rolls,
            michelson_maximum_type_size)), ()) )
@@ -190,7 +183,6 @@ let constants_encoding =
            ( proof_of_work_threshold,
              bootstrap_keys,
              dictator_pubkey,
-             max_number_of_operations,
              max_operation_data_length,
              token_per_rolls,
              michelson_maximum_type_size)), ()) ->
@@ -219,8 +211,6 @@ let constants_encoding =
           unopt default.bootstrap_keys bootstrap_keys ;
         dictator_pubkey =
           unopt default.dictator_pubkey dictator_pubkey ;
-        max_number_of_operations =
-          unopt default.max_number_of_operations max_number_of_operations ;
         max_operation_data_length =
           unopt default.max_operation_data_length max_operation_data_length ;
         token_per_rolls =
@@ -241,12 +231,11 @@ let constants_encoding =
               (opt "first_free_baking_slot" uint16)
               (opt "endorsers_per_block" uint16)
               (opt "instructions_per_transaction" int31))
-           (obj7
+           (obj6
               (opt "proof_of_work_threshold" int64)
               (opt "bootstrap_keys" (list Ed25519.Public_key.encoding))
               (opt "dictator_pubkey" Ed25519.Public_key.encoding)
-              (opt "max_number_of_operations" (list uint16))
-              (opt "max_number_of_operations" int31)
+              (opt "max_operation_data_length" int31)
               (opt "token_per_rolls" Tez_repr.encoding)
               (opt "michelson_maximum_type_size" uint16)
            ))
diff --git a/src/proto_alpha/lib_protocol/src/constants_storage.ml b/src/proto_alpha/lib_protocol/src/constants_storage.ml
index bbeeb9623..36c6a8ec6 100644
--- a/src/proto_alpha/lib_protocol/src/constants_storage.ml
+++ b/src/proto_alpha/lib_protocol/src/constants_storage.ml
@@ -40,9 +40,6 @@ let proof_of_work_threshold c =
 let dictator_pubkey c =
   let constants = Raw_context.constants c in
   constants.dictator_pubkey
-let max_number_of_operations c =
-  let constants = Raw_context.constants c in
-  constants.max_number_of_operations
 let max_operation_data_length c =
   let constants = Raw_context.constants c in
   constants.max_operation_data_length