From 53125c9105970ee9f5ca69045b2d15507d02da2b Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Mon, 14 Aug 2023 14:12:26 +0200 Subject: [PATCH] Docs: Remove docs/odoc_protocols.patch This patch does not make sense. Only source files directly in lib_protocol directories are covered by the computation of the protocol hashes. As a consequence, we can safely apply the patch and remove it from the codebase. --- docs/Makefile | 1 - docs/odoc_protocols.patch | 32 ------------------- .../lib_sc_rollup_node/dal_pages_request.mli | 2 +- .../lib_sc_rollup_node/inbox.mli | 2 +- 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 docs/odoc_protocols.patch diff --git a/docs/Makefile b/docs/Makefile index a980caabd4e5..f83aa90de826 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -89,7 +89,6 @@ odoc-lite: docexes rsync --recursive --links --perms \ ../scripts ../script-inputs ../src ../tezt ../vendors ../dune ../dune-project $(TMPDOCDIR)/ cd $(TMPDOCDIR)/ && ./scripts/remove-old-protocols.sh - patch -d $(TMPDOCDIR) -p1 $(TMPDOCDIR)/odoc.log 2>&1; \ RESULT=$$?; \ diff --git a/docs/odoc_protocols.patch b/docs/odoc_protocols.patch deleted file mode 100644 index fd608670f263..000000000000 --- a/docs/odoc_protocols.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit cdf9c9c25cab3824806ab10d1759f9b017705984 -Author: Nic Volanschi -Date: Wed May 10 12:14:15 2023 +0200 - - REMOVEME: doc patchs for old protocols - -diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli -index 3be2cdb1f5..f27d737fbc 100644 ---- a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli -+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli -@@ -42,7 +42,7 @@ type error += Dal_slot_not_found_in_store of Dal.Slot.Header.id - The function returns [Dal_slot_not_found_in_store] if no entry is found in - the store for the given ID (i.e. no page is registered with or without content). - -- If the returned value is [Some pages]], the slot whose ID is given is -+ If the returned value is [Some pages], the slot whose ID is given is - supposed to be confirmed and [pages] correspond to the pages of the slot. - Otherwise [None] is returned. - -diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli b/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli -index a723ad47e5..29caafad18 100644 ---- a/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli -+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli -@@ -56,7 +56,7 @@ val start : unit -> unit Lwt.t - - (** [add_messages ~is_migration_block ~predecessor_timestamp - ~predecessor inbox messages] adds [messages] to the [inbox] using -- {!Inbox.add_all_messages}. *) -+ {!Sc_rollup.Inbox.add_all_messages}. *) - val add_messages : - is_migration_block:bool -> - predecessor_timestamp:Timestamp.time -> diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli index 3be2cdb1f5ab..f27d737fbc29 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.mli @@ -42,7 +42,7 @@ type error += Dal_slot_not_found_in_store of Dal.Slot.Header.id The function returns [Dal_slot_not_found_in_store] if no entry is found in the store for the given ID (i.e. no page is registered with or without content). - If the returned value is [Some pages]], the slot whose ID is given is + If the returned value is [Some pages], the slot whose ID is given is supposed to be confirmed and [pages] correspond to the pages of the slot. Otherwise [None] is returned. diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli b/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli index 392bc33a487b..8ef03d9056fc 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/inbox.mli @@ -56,7 +56,7 @@ val start : unit -> unit Lwt.t (** [add_messages ~is_first_block ~predecessor_timestamp ~predecessor inbox messages] adds [messages] to the [inbox] using - {!Inbox.add_all_messages}. *) + {!Sc_rollup.Inbox.add_all_messages}. *) val add_messages : is_first_block:bool -> predecessor_timestamp:Timestamp.time -> -- GitLab