=serialization rm 5.2.4 workaround, fix LWWMap with Codable Value (Codable in Proto nesting) #782
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ktoso
changed the title
ktoso
commented
Oct 14, 2020
| // return try context.serialization.deserialize(as: T.self, from: .data(data), using: manifest) | ||
| // } | ||
| // | ||
| // } |
ktoso
commented
Oct 14, 2020
| // ==== ---------------------------------------------------------------------------------------------------------------- | ||
| // MARK: Top-Level Bytes-Blob Encoder | ||
|
|
||
| // TODO: TopLevelDataEncoder |
Member
Author
There was a problem hiding this comment.
this actually kind of implements just that I guess :nod:
ktoso
commented
Oct 14, 2020
| func unkeyedContainer() -> UnkeyedEncodingContainer { | ||
| fatalErrorBacktrace("Attempted \(#function) in \(self)") | ||
| // TopLevelProtobufBlobEncoderContainer(superEncoder: self) | ||
| // TopLevelProtobufBlobUnkeyedEncodingContainer(superEncoder: self) |
Member
Author
There was a problem hiding this comment.
though we don't actually need it, good
ktoso
commented
Oct 14, 2020
| try data.encode(to: self.superEncoder) | ||
| try self.superEncoder.store(data: data) | ||
| case let bytes as [UInt8]: | ||
| try self.superEncoder.store(bytes: bytes) |
Member
Author
There was a problem hiding this comment.
so we're not really "encoding" we're just using it and that's great 👍
ktoso
commented
Oct 14, 2020
| settings.serialization.register(CRDT.LWWRegister<String?>.self) | ||
| settings.serialization.register(CodableExampleValue.self) | ||
| settings.serialization.register(CRDT.LWWMap<String, CodableExampleValue>.self) | ||
| settings.serialization.register(CRDT.LWWRegister<CodableExampleValue>.self) |
Member
Author
There was a problem hiding this comment.
a bit annoying - but good reminder, to use a LWWMap one has to use a LWWRegister heh :~
ktoso
commented
Oct 14, 2020
| let gossipTwoExpectMap: [String: CodableExampleValue] = ["a": "foo", "aa": "baz", "b": "bar"] | ||
| try self.expectMap(probe: p1, expected: gossipTwoExpectMap) | ||
| try self.expectMap(probe: p2, expected: gossipTwoExpectMap) | ||
| } |
| try data.encode(to: self.superEncoder) | ||
| try self.superEncoder.store(data: data) | ||
| case let bytes as [UInt8]: | ||
| try self.superEncoder.store(bytes: bytes) |
yim-lee
approved these changes
Oct 14, 2020
Member
Author
|
I honestly don't understand the 5.2 failure :| |
Member
Author
|
CI is on 5.2.1... 😞 Well, that explains it... this will pass once CI uses 5.2.5 heh -- I could remove the first hack removal commit but we really want to CI on 5.2.5. |
Member
Author
|
@swift-server-bot test this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
Modifications:
Result:
Commit 2 e86b29e
Motivation:
Modifications:
Result: