Simplify proto value decoder

christophhagen · Jul 9, 2022 · fadbaa7 · fadbaa7
1 parent ed98585
commit fadbaa7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/Sources/BinaryCodable/Decoding/Protobuf/ProtoDecodingNode.swift b/Sources/BinaryCodable/Decoding/Protobuf/ProtoDecodingNode.swift
@@ -4,17 +4,13 @@ class ProtoDecodingNode: AbstractDecodingNode, Decoder {
 
     let storage: Storage
 
-    private let isAtTopLevel: Bool
-
-    init(data: Data, top: Bool = false, path: [CodingKey], info: UserInfo) {
+    init(data: Data, path: [CodingKey], info: UserInfo) {
         self.storage = .data(data)
-        self.isAtTopLevel = top
         super.init(path: path, info: info)
     }
 
-    init(decoder: DataDecoder, isNil: Bool = false, path: [CodingKey], info: UserInfo) {
+    init(decoder: DataDecoder, path: [CodingKey], info: UserInfo) {
         self.storage = .decoder(decoder)
-        self.isAtTopLevel = false
         super.init(path: path, info: info)
     }
 
@@ -30,7 +26,6 @@ class ProtoDecodingNode: AbstractDecodingNode, Decoder {
     func singleValueContainer() throws -> SingleValueDecodingContainer {
         return ProtoValueDecoder(
             data: storage.useAsDecoder(),
-            top: isAtTopLevel,
             path: codingPath,
             info: userInfo)
     }

diff --git a/Sources/BinaryCodable/Decoding/Protobuf/ProtoValueDecoder.swift b/Sources/BinaryCodable/Decoding/Protobuf/ProtoValueDecoder.swift
@@ -4,11 +4,8 @@ final class ProtoValueDecoder: AbstractDecodingNode, SingleValueDecodingContaine
 
     let data: DataDecoder
 
-    private let isAtTopLevel: Bool
-
-    init(data: DataDecoder, top: Bool = false, path: [CodingKey], info: UserInfo) {
+    init(data: DataDecoder, path: [CodingKey], info: UserInfo) {
         self.data = data
-        self.isAtTopLevel = top
         super.init(path: path, info: info)
     }
 

diff --git a/Sources/BinaryCodable/ProtobufDecoder.swift b/Sources/BinaryCodable/ProtobufDecoder.swift
@@ -47,7 +47,7 @@ public final class ProtobufDecoder {
      - Throws: Errors of type `BinaryDecodingError` or `ProtobufDecodingError`
      */
     public func decode<T>(_ type: T.Type = T.self, from data: Data) throws -> T where T: Decodable {
-        let root = ProtoDecodingNode(data: data, top: true, path: [], info: userInfo)
+        let root = ProtoDecodingNode(data: data, path: [], info: userInfo)
         return try type.init(from: root)
     }