improvements: code clean up

Author: speeddragon

README.md

@@ -87,7 +87,7 @@ HyperBEAM supports several optional build profiles that enable additional featur
 
 - `genesis_wasm`: Enables Genesis WebAssembly support
 - `rocksdb`: Enables RocksDB storage backend (adds RocksDB v1.8.0 dependency)
-- `s3`: Enables S3 storage backend 
+- `s3`: Enables S3 storage backend
 - `http3`: Enables HTTP/3 support via QUIC protocol
 
 Using these profiles allows you to optimize HyperBEAM for your specific use case without adding unnecessary dependencies to the base installation.
@@ -109,7 +109,9 @@ To create a release with profiles:
 rebar3 as rocksdb,genesis_wasm release
 
 # Run S3 integration tests (make sure you have docker-compose installed)
-rebar3 as s3 cmd docker_up, eunit --module hb_store_s3, cmd docker_down
+docker-compose -f test/docker-compose.yml -d up
+rebar3 as s3 eunit --module hb_store_s3
+docker-compose -f test/docker-compose.yml -d down
 ```
 
 Note: Profiles modify compile-time options that get baked into the release. Choose the profiles you need before starting HyperBEAM.
@@ -269,9 +271,9 @@ schedule of another execution.
 Details on other devices found in the pre-loaded set can be located in their 
 respective documentation.
 
-## Testing 
+## Testing
 
-### Running tests 
+### Running tests
 
 Specific tests can be ran with `--test` parameter:
 
@@ -309,9 +311,9 @@ To test generator tests, you need to add `-g` to the eunit command:
 rebar3 eunit -g hb_cache:cache_suite_test_
 ```
 
-### Generating test coverage report 
+### Generating test coverage report
 
-Add `--cover` to the eunit command to generate test coverage data. 
+Add `--cover` to the eunit command to generate test coverage data.
 To generate the HTML report, run the command `cover`.
 
 ```
@@ -351,4 +353,4 @@ HyperBEAM is developed as an open source implementation of the AO-Core protocol
 by [Forward Research](https://fwd.arweave.net). Pull Requests are always welcome!
 
 To get started building on HyperBEAM, check out the [hacking on HyperBEAM](./docs/misc/hacking-on-hyperbeam.md)
-guide.
+guide.

rebar.config

@@ -62,9 +62,8 @@
             {add, gun, [{erl_opts, [{d, 'GUN_QUICER', 1}]}]}
         ]}
     ]},
-    {recon, [{deps, [{recon, "2.5.6"}]}]},
     {test, [
-		{deps, [{meck, "1.1.0"}]}
+        {deps, [{meck, "1.1.0"}]}
     ]}
 ]}.
 
@@ -193,4 +192,4 @@
 	{preprocess, true},
 	{private, true},
 	{hidden, true}
-]}.
+]}.

src/dev_scheduler.erl

@@ -2272,4 +2272,4 @@ benchmark_suite(Port, Base) ->
             },
             desc => <<"100xRocksDB store, aggressive conf, http/3.">>
         }
-    ].
+    ].

src/hb_cache.erl

@@ -385,7 +385,6 @@ read(Path, Opts) ->
 %% @doc List all of the subpaths of a given path and return a map of keys and
 %% links to the subpaths, including their types.
 store_read(_Path, no_viable_store, _) ->
-    erlang:display("NO_VIABLE_STORE"),
     not_found;
 store_read(Path, Store, Opts) ->
     ResolvedFullPath = hb_store:resolve(Store, PathBin = hb_path:to_binary(Path)),
@@ -395,16 +394,12 @@ store_read(Path, Store, Opts) ->
         {store, Store}
     }),
     case hb_store:type(Store, ResolvedFullPath) of
-        not_found -> 
-            erlang:display({type_not_found, {resolved_full_path, ResolvedFullPath}}),
-            not_found;
+        not_found -> not_found;
         simple ->
             ?event({reading_data, ResolvedFullPath}),
             case hb_store:read(Store, ResolvedFullPath) of
                 {ok, Bin} -> {ok, Bin};
-                not_found -> 
-                    erlang:display("NOT FOUND"),
-                    not_found
+                not_found -> not_found
             end;
         composite ->
             ?event({reading_composite, ResolvedFullPath}),
@@ -888,9 +883,7 @@ test_message_with_list(Store) ->
     {ok, RetrievedItem} = read(Path, Opts),
     ?assert(hb_message:match(Msg, RetrievedItem, strict, Opts)).
 
-test_match_message(Store) when map_get(<<"store-module">>, Store) =/= hb_store_lmdb ->    
-    Module = map_get(<<"store-module">>, Store),
-    ?event({test_skip, {module, Module}}),
+test_match_message(Store) when map_get(<<"store-module">>, Store) =/= hb_store_lmdb ->
     skip;
 test_match_message(Store) ->
     hb_store:reset(Store),
@@ -918,8 +911,6 @@ test_match_message(Store) ->
     ?assertEqual([ID2b], MatchedItems2).
 
 test_match_linked_message(Store) when map_get(<<"store-module">>, Store) =/= hb_store_lmdb ->
-    Module = map_get(<<"store-module">>, Store),
-    ?event({test_skip, {module, Module}}),
     skip;
 test_match_linked_message(Store) ->
     hb_store:reset(Store),
@@ -937,8 +928,6 @@ test_match_linked_message(Store) ->
     ?assertEqual(#{ <<"a">> => Inner }, ensure_all_loaded(Read2, Opts)).
 
 test_match_typed_message(Store) when map_get(<<"store-module">>, Store) =/= hb_store_lmdb ->
-    Module = map_get(<<"store-module">>, Store),
-    ?event({test_skip, {module, Module}}),
     skip;
 test_match_typed_message(Store) ->
     hb_store:reset(Store),
@@ -994,4 +983,4 @@ test_device_map_cannot_be_written_test() ->
 %% @doc Run a specific test with a given store module.
 run_test() ->
     Store = hb_test_utils:test_store(hb_store_lmdb),
-    test_match_message(Store).
+    test_match_message(Store).

src/hb_cache_control.erl

@@ -136,13 +136,11 @@ perform_cache_write(Base, Req, Res, Opts) ->
     hb_cache:write(Req, Opts),
     case Res of
         <<_/binary>> ->
-            Store = hb_opts:get(store, no_viable_store, Opts),
-            HP = hb_path:hashpath(Base, Req, Opts),
-            DataPath = <<"data/", (hb_path:hashpath(Res, Opts))/binary>>,
-            case hb_store:type(Store, DataPath) of
-                simple -> hb_store:make_link(Store, DataPath, HP);
-                _ -> hb_cache:write_binary(HP, Res, Opts)
-            end;
+            hb_cache:write_binary(
+                hb_path:hashpath(Base, Req, Opts),
+                Res,
+                Opts
+            );
         Map when is_map(Map) ->
             hb_cache:write(Res, Opts);
         _ ->
@@ -425,4 +423,4 @@ cache_message_result_test() ->
     {ok, Res3} = hb_ao:resolve(Base, Req, #{ cache_control => [<<"only-if-cached">>] }),
     ?event({res2, Res2}),
     ?event({res3, Res3}),
-    ?assertEqual(Res2, Res3).
+    ?assertEqual(Res2, Res3).

src/hb_http_client.erl

@@ -4,7 +4,7 @@
 -behaviour(gen_server).
 -include("include/hb.hrl").
 -export([start_link/1, request/2]).
--export([init/1, handle_cast/2, handle_call/3, handle_info/2, terminate/2, open_connection/2]).
+-export([init/1, handle_cast/2, handle_call/3, handle_info/2, terminate/2]).
 
 -record(state, {
 	pid_by_peer = #{},
@@ -154,7 +154,7 @@ gun_req(Args, ReestablishedConnection, Opts) ->
                     Reply ->
                         Reply
                 end;
-            {'EXIT', Reason} ->
+            {'EXIT', _} ->
                 {error, client_error};
             Error ->
                 Error

src/hb_store.erl

@@ -426,20 +426,20 @@ call_all([Store = #{<<"store-module">> := Mod} | Rest], Function, Args) ->
 %% default into all HyperBEAM distributions.
 test_stores() ->
     [
-%        (hb_test_utils:test_store(hb_store_fs))#{
-%            <<"benchmark-scale">> => 0.001
-%        },
-%        (hb_test_utils:test_store(hb_store_lmdb))#{
-%            <<"benchmark-scale">> => 0.5
-%        },
-%        (hb_test_utils:test_store(hb_store_lru))#{
-%            <<"persistent-store">> => [
-%                #{
-%                    <<"store-module">> => hb_store_fs,
-%                    <<"name">> => <<"cache-TEST/lru">>
-%                }
-%            ]
-%        }
+        (hb_test_utils:test_store(hb_store_fs))#{
+            <<"benchmark-scale">> => 0.001
+        },
+        (hb_test_utils:test_store(hb_store_lmdb))#{
+            <<"benchmark-scale">> => 0.5
+        },
+        (hb_test_utils:test_store(hb_store_lru))#{
+            <<"persistent-store">> => [
+                #{
+                    <<"store-module">> => hb_store_fs,
+                    <<"name">> => <<"cache-TEST/lru">>
+                }
+            ]
+        }
     ] ++ rocks_stores() ++ s3_stores().
 
 -ifdef(ENABLE_ROCKSDB).
@@ -475,8 +475,7 @@ generate_test_suite(Suite, Stores) ->
                     hb_store:reset(Store)
                 end,
                 fun(_) ->
-                    %hb_store:reset(Store)
-                    ok
+                    hb_store:reset(Store)
                     % hb_store:stop(Store)
                 end,
                 [
@@ -533,8 +532,8 @@ store_suite_test_() ->
 
 benchmark_suite_test_() ->
     generate_test_suite([
-        %{"benchmark key read write", fun benchmark_key_read_write/1},
-        %{"benchmark list", fun benchmark_list/1},
+        {"benchmark key read write", fun benchmark_key_read_write/1},
+        {"benchmark list", fun benchmark_list/1},
         {"benchmark message read write", fun benchmark_message_read_write/1}
     ]).
 
@@ -852,7 +851,6 @@ benchmark_message_read_write(Store, WriteOps, ReadOps) ->
                     fun({MsgID, Msg}, Count) -> 
                         case hb_cache:read(MsgID, Opts) of
                             {ok, Base} ->
-                                erlang:display(Base),        
                                 case hb_cache:ensure_all_loaded(Base, Opts) of
                                     Msg -> Count;
                                     _ -> Count + 1