From 6a236a8678de0aa17d7ad8c2879eeb2829c8c2db Mon Sep 17 00:00:00 2001
From: Maikel <maikel@email.org.au>
Date: Wed, 1 Nov 2023 15:16:57 +1100
Subject: [PATCH] Revert "replace hiredis gem with hiredis-client"

---
 Gemfile                                                |  4 ++--
 Gemfile.lock                                           | 10 ++++------
 .../spree/admin/payment_methods_controller.rb          |  8 +-------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 67cc28d79c..eb10105e75 100644
--- a/Gemfile
+++ b/Gemfile
@@ -98,9 +98,9 @@ gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
 
-gem 'hiredis-client'
+gem 'hiredis'
 gem 'puma'
-gem 'redis'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f2e5625a8e..c8397e9b36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -332,8 +332,7 @@ GEM
     hashery (2.1.2)
     hashie (5.0.0)
     highline (2.0.3)
-    hiredis-client (0.17.0)
-      redis-client (= 0.17.0)
+    hiredis (0.6.3)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     i18n (1.14.1)
@@ -566,8 +565,7 @@ GEM
     rdf (3.2.11)
       link_header (~> 0.0, >= 0.0.8)
     redcarpet (3.6.0)
-    redis (5.0.8)
-      redis-client (>= 0.17.0)
+    redis (4.8.1)
     redis-client (0.17.0)
       connection_pool
     regexp_parser (2.8.2)
@@ -841,7 +839,7 @@ DEPENDENCIES
   good_migrations
   haml
   highline (= 2.0.3)
-  hiredis-client
+  hiredis
   i18n
   i18n-js (~> 3.9.0)
   image_processing
@@ -885,7 +883,7 @@ DEPENDENCIES
   rails_safe_tasks (~> 1.0)
   ransack (~> 2.6.0)
   redcarpet
-  redis
+  redis (>= 4.0)
   responders
   rexml
   roadie-rails
diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb
index 6398f02f65..077cddbca8 100644
--- a/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/app/controllers/spree/admin/payment_methods_controller.rb
@@ -197,16 +197,10 @@ module Spree
 
       def clear_preference_cache
         @payment_method.calculator.preferences.each_key do |key|
-          delete_from_cache @payment_method.calculator.preference_cache_key(key)
+          Rails.cache.delete(@payment_method.calculator.preference_cache_key(key))
         end
       end
 
-      def delete_from_cache(cache_key)
-        return unless cache_key.class.in? [String, Integer, Float, Symbol]
-
-        Rails.cache.delete(cache_key)
-      end
-
       def add_type_to_calculator_attributes(hash)
         hash["calculator_attributes"]["type"] = hash["calculator_type"]
       end