Fix merge conflicts

apps/arweave/src/ar_doctor_bench.erl

@@ -41,7 +41,6 @@ bench_read(Args) ->
  ar:console("'~s'~n~n", [?FILE_FORMAT]),
 
  StopTime = erlang:monotonic_time() + erlang:convert_time_unit(Duration, second, native),
- File = file:open(?OUTPUT_FILENAME, [write, append]),
 
  Results = ar_util:pmap(
  fun(StorageModule) ->

apps/arweave/src/ar_mining_hash.erl

@@ -3,7 +3,7 @@
 -behaviour(gen_server).
 
 -export([start_link/0, compute_h0/2, compute_h1/2, compute_h2/2,
- set_cache_limit/1, garbage_collect/0]).
+ garbage_collect/0]).
 
 -export([init/1, handle_cast/2, handle_call/3, handle_info/2, terminate/2]).
 
@@ -15,9 +15,7 @@
 
 -record(state, {
  hashing_threads = queue:new(),
- hashing_thread_monitor_refs = #{},
- chunks_seen = 0,
- chunk_cache_limit = infinity
+ hashing_thread_monitor_refs = #{}
 }).
 
 %%%===================================================================
@@ -37,9 +35,6 @@ compute_h1(Worker, Candidate) ->
 compute_h2(Worker, Candidate) ->
  gen_server:cast(?MODULE, {compute, h2, Worker, Candidate}).
 
-set_cache_limit(CacheLimit) ->
- gen_server:cast(?MODULE, {set_cache_limit, CacheLimit}).
-
 garbage_collect() ->
  gen_server:cast(?MODULE, garbage_collect).
 
@@ -61,9 +56,6 @@ handle_call(Request, _From, State) ->
  ?LOG_WARNING([{event, unhandled_call}, {module, ?MODULE}, {request, Request}]),
  {reply, ok, State}.
 
-handle_cast({set_cache_limit, CacheLimit}, State) ->
- {noreply, State#state{ chunk_cache_limit = CacheLimit }};
-
 handle_cast({compute, HashType, Worker, Candidate},
  #state{ hashing_threads = Threads } = State) ->
  {Thread, Threads2} = pick_hashing_thread(Threads),

apps/arweave/src/ar_mining_io.erl

@@ -257,10 +257,9 @@ read_range(WhichChunk, Worker, Candidate, RangeStart, StoreID) ->
  StartTime = erlang:monotonic_time(),
  Size = ?RECALL_RANGE_SIZE,
  #mining_candidate{ mining_address = MiningAddress } = Candidate,
- UniqueSize = Size, %% + (rand:uniform(100)*?DATA_CHUNK_SIZE),
- Intervals = get_packed_intervals(RangeStart, RangeStart + UniqueSize,
+ Intervals = get_packed_intervals(RangeStart, RangeStart + Size,
  MiningAddress, StoreID, ar_intervals:new()),
- ChunkOffsets = ar_chunk_storage:get_range(RangeStart, UniqueSize, StoreID),
+ ChunkOffsets = ar_chunk_storage:get_range(RangeStart, Size, StoreID),
  ChunkOffsets2 = filter_by_packing(ChunkOffsets, Intervals, StoreID),
  NonceMax = max(0, (Size div ?DATA_CHUNK_SIZE - 1)),
  read_range(WhichChunk, Worker, Candidate, RangeStart, 0, NonceMax, ChunkOffsets2),

apps/arweave/src/ar_mining_server.erl

@@ -6,7 +6,7 @@
 
 -export([start_link/0, start_mining/1, set_difficulty/1, set_merkle_rebase_threshold/1, 
  compute_h2_for_peer/1, prepare_and_post_solution/1, post_solution/1, read_poa/3,
- get_recall_bytes/4, active_sessions/0, encode_sessions/1]).
+ get_recall_bytes/4, active_sessions/0, encode_sessions/1, add_pool_job/1]).
 -export([pause/0]).
 
 -export([init/1, handle_cast/2, handle_call/3, handle_info/2, terminate/2]).
@@ -23,7 +23,7 @@
  workers = #{},
  active_sessions = sets:new(),
  diff = infinity,
- chunk_cache_size_limit  = 0,
+ chunk_cache_limit  = 0,
  gc_frequency_ms = undefined,
  merkle_rebase_threshold = infinity,
  is_pool_client = false
@@ -319,7 +319,6 @@ update_cache_limits(State) ->
  end,
  State#state.workers
  ),
- ar_mining_hash:set_cache_limit(OverallCacheLimit),
 
  ar:console(
  "~nSetting the mining chunk cache size limit to ~B chunks "

apps/arweave/src/ar_mining_worker.erl

@@ -29,7 +29,6 @@
 
 -define(TASK_CHECK_FREQUENCY_MS, 200).
 -define(LAG_CHECK_FREQUENCY_MS, 5000).
--define(SAMPLE_PROCESS_INTERVAL, 1000).
 
 %%%===================================================================
 %%% Public interface.
@@ -334,7 +333,8 @@ handle_task({computed_h0, Candidate}, State) ->
 
 handle_task({computed_h1, Candidate}, State) ->
  #state{ diff = Diff } = State,
- #mining_candidate{ h1 = H1, chunk1 = Chunk1, partial_diff = PartialDiff } = Candidate,
+ #mining_candidate{ h1 = H1, chunk1 = Chunk1, session_key = SessionKey, 
+ partial_diff = PartialDiff } = Candidate,
  case passes_diff_check(H1, Diff, PartialDiff) of
  true ->
  ?LOG_DEBUG([{event, mining_debug_found_h1_solution}, {worker, State#state.name},

apps/arweave/src/ar_pool.erl

@@ -340,7 +340,7 @@ process_partial_solution_poa2_size(Solution, Ref) ->
 process_partial_solution_partition_number(Solution, Ref) ->
  PartitionNumber = Solution#mining_solution.partition_number,
  PartitionUpperBound = Solution#mining_solution.partition_upper_bound,
- Max = ?MAX_PARTITION_NUMBER(PartitionUpperBound),
+ Max = ar_node:get_max_partition_number(PartitionUpperBound),
  case PartitionNumber > Max of
  false ->
  process_partial_solution_nonce(Solution, Ref);

apps/arweave/test/ar_mining_server_tests.erl

@@ -41,20 +41,20 @@ cleanup_one(_) ->
 %% ------------------------------------------------------------------------------------------------
 %% Test Registration
 %% ------------------------------------------------------------------------------------------------
-% chunk_cache_size_test_() ->
-%  {setup, fun setup_all/0, fun cleanup_all/1,
-%  {foreach, fun setup_one/0, fun cleanup_one/1,
-%  [
-%  {timeout, 30, fun test_h2_solution_chunk1_first/0},
-%  {timeout, 30, fun test_h2_solution_chunk2_first/0},
-%  {timeout, 30, fun test_h1_solution_h2_synced_chunk1_first/0},
-%  {timeout, 30, fun test_h1_solution_h2_synced_chunk2_first/0},
-%  {timeout, 30, fun test_h1_solution_h2_unsynced/0},
-%  {timeout, 30, fun test_no_solution_then_h2_solution/0},
-%  {timeout, 30, fun test_no_solution_then_h1_solution_h2_synced/0},
-%  {timeout, 30, fun test_no_solution_then_h1_solution_h2_unsynced/0}
-%  ]}
-%  }.
+chunk_cache_size_test_() ->
+ {setup, fun setup_all/0, fun cleanup_all/1,
+ {foreach, fun setup_one/0, fun cleanup_one/1,
+ [
+ {timeout, 30, fun test_h2_solution_chunk1_first/0},
+ {timeout, 30, fun test_h2_solution_chunk2_first/0},
+ {timeout, 30, fun test_h1_solution_h2_synced_chunk1_first/0},
+ {timeout, 30, fun test_h1_solution_h2_synced_chunk2_first/0},
+ {timeout, 30, fun test_h1_solution_h2_unsynced/0},
+ {timeout, 30, fun test_no_solution_then_h2_solution/0},
+ {timeout, 30, fun test_no_solution_then_h1_solution_h2_synced/0},
+ {timeout, 30, fun test_no_solution_then_h1_solution_h2_unsynced/0}
+ ]}
+ }.
 
 %% ------------------------------------------------------------------------------------------------
 %% chunk_cache_size_test_