Merge pull request #98 from thekuwayama/ech_outer_extensions__7

[ech_outer_extensions] 7. refactor: remove_and_replace! without sort & reduce

Author: thekuwayama

.rubocop.yml

@@ -4,15 +4,15 @@ AllCops:
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
+Semicolon:
+  AllowAsExpressionSeparator: true
+
 Style/ConditionalAssignment:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-Style/EachWithObject:
-  Enabled: false
-
 Style/NumericLiterals:
   Enabled: false
 

lib/tttls1.3/message/extensions.rb

@@ -105,31 +105,31 @@ def <<(ex)
         store(ex.extension_type, ex)
       end
 
-      # @param ex_types [Array of TTTLS13::Message::ExtensionType]
+      # removing and replacing extensions from EncodedClientHelloInner
+      # with a single "ech_outer_extensions"
+      #
+      # for example
+      # - before
+      #   - self.keys:  [A B C D E]
+      #   - param    :  [D B]
+      # - after remove_and_replace!
+      #   - self.keys:  [A C E B D]
+      #   - return   :  [A C E ech_outer_extensions[B D]]
+      # @param outer_extensions [Array of TTTLS13::Message::ExtensionType]
       #
       # @return [TTTLS13::Message::Extensions] for EncodedClientHelloInner
-      def remove_and_replace!(ex_types)
-        # NOTE: sort external_extensions in descending order.
-        tmp1 = filter { |k, _| !ex_types.include?(k) }
-        tmp2 = filter { |k, _| ex_types.include?(k) }.sort
+      def remove_and_replace!(outer_extensions)
+        tmp1 = filter { |k, _| !outer_extensions.include?(k) }
+        tmp2 = filter { |k, _| outer_extensions.include?(k) }
+
         clear
-        tmp1.each { |k, v| self[k] = v }
-        tmp2.each { |k, v| self[k] = v }
-
-        # removing and replacing extensions from EncodedClientHelloInner
-        # with a single "ech_outer_extensions"
-        reduce(Message::Extensions.new) do |acc, (k, v)|
-          if ex_types.include?(k) &&
-             !acc.include?(Message::ExtensionType::ECH_OUTER_EXTENSIONS)
-            outer_extensions = (ex_types - (ex_types - keys)).sort
-            acc[Message::ExtensionType::ECH_OUTER_EXTENSIONS] = \
-              Message::Extension::ECHOuterExtensions.new(outer_extensions)
-          elsif !ex_types.include?(k)
-            acc[k] = v
-          end
+        replaced = Message::Extensions.new
+        tmp1.each { |_, v| self << v; replaced << v }
+        tmp2.each { |_, v| self << v }
 
-          acc
-        end
+        replaced << Message::Extension::ECHOuterExtensions.new(tmp2.keys) \
+          unless tmp2.keys.empty?
+        replaced
       end
 
       class << self