From e7cfe562b4f39c7692fff9d53db9a13bde0b8072 Mon Sep 17 00:00:00 2001
From: Sam Williams <samuel.ecwilliams@gmail.com>
Date: Sun, 7 Oct 2018 20:07:26 -0700
Subject: [PATCH] - Flipped rewrite order.

- Improved logging messages.
---
 src/ar_cleanup.erl       | 6 +++---
 src/ar_fork_recovery.erl | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ar_cleanup.erl b/src/ar_cleanup.erl
index ba94052d3..805ed8633 100644
--- a/src/ar_cleanup.erl
+++ b/src/ar_cleanup.erl
@@ -53,18 +53,18 @@ remove_invalid_blocks(HashList) ->
 %% In the case of upgrading a node from 1.1 to 1.5, this dramatically reduces
 %% the size of the weave on disk (and on the wire).
 rewrite() ->
-	rewrite(ar_node:get_hash_list(whereis(http_entrypoint_node))).
+	rewrite(lists:reverse(ar_node:get_hash_list(whereis(http_entrypoint_node)))).
 rewrite(BHL) -> rewrite(BHL, BHL).
 rewrite([], _BHL) -> [];
 rewrite([H|Rest], BHL) ->
 	try ar_storage:read_block(H, BHL) of
 		B when ?IS_BLOCK(B) ->
 			ar_storage:write_block(B),
-			ar:report([{compacted_block, ar_util:encode(H)}]);
+			ar:report([{rewrote_block, ar_util:encode(H)}]);
 		unavailable ->
 			do_nothing
 	catch _:_ ->
-		ar:report([{error_compacting_block, ar_util:encode(H)}])
+		ar:report([{error_rewriting_block, ar_util:encode(H)}])
 	end,
 	rewrite(Rest, BHL).
 
diff --git a/src/ar_fork_recovery.erl b/src/ar_fork_recovery.erl
index 98dea3b7f..153a50cec 100644
--- a/src/ar_fork_recovery.erl
+++ b/src/ar_fork_recovery.erl
@@ -187,7 +187,13 @@ do_fork_recover(S = #state {
 					}
 				);
 			false ->
-				ar:report(not_updating_target_block),
+				ar:report(
+					[
+						not_updating_target_block,
+						{ignored_block, ar_util:encode(Block#block.indep_hash)},
+						{height, Block#block.height}
+					]
+				),
 				server(S)
 		end;
 	apply_next_block ->