Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add TLV and TLV stream codec support #1045

Merged
merged 12 commits into from Jul 2, 2019
Merged

Add TLV and TLV stream codec support #1045

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f8b5fa3
LightningMessageTypes/Codecs: clean-up warnings
t-bast Jun 20, 2019
9960c3d
Add Bitcoin varInt codec
t-bast Jun 20, 2019
8a2a249
Remove unused FixedSizeStrictCodec.
t-bast Jun 20, 2019
7dadd2d
Add generic TLV codec.
t-bast Jun 20, 2019
fa8867a
Codecs refactoring.
t-bast Jun 20, 2019
74942ec
Add tlv stream codec.
t-bast Jun 21, 2019
beaf0b4
Replace custom attemptFromTry by scodec's built-in Attempt.fromTry()
t-bast Jun 21, 2019
35b0953
Make varint (CompactSize) a Codec[UInt64] instead of Codec[Long]
t-bast Jun 24, 2019
451697c
Move TlvStream errors to companion object.
t-bast Jun 28, 2019
f87f924
Rename varlong to varintoverflow for consistency
t-bast Jun 28, 2019
8229a0b
Clean up Tlv stream.
t-bast Jul 1, 2019
d63388b
Simplify varint codec (credits to pm47)
t-bast Jul 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions eclair-core/src/main/scala/fr/acinq/eclair/wire/CommonCodecs.scala
View file
Open in desktop
Expand Up @@ -26,19 +26,14 @@ import scodec.{Attempt, Codec, DecodeResult, Err}
import scodec.bits.{BitVector, ByteVector}
import scodec.codecs._

import scala.util.{Failure, Success, Try}
import scala.util.Try

/**
* Created by t-bast on 20/06/2019.
*/

object CommonCodecs {

def attemptFromTry[T](f: => T): Attempt[T] = Try(f) match {
case Success(t) => Attempt.successful(t)
case Failure(t) => Attempt.failure(Err(s"deserialization error: ${t.getMessage}"))
}

// this codec can be safely used for values < 2^63 and will fail otherwise
// (for something smarter see https://github.com/yzernik/bitcoin-scodec/blob/master/src/main/scala/io/github/yzernik/bitcoinscodec/structures/UInt64.scala)
val uint64: Codec[Long] = int64.narrow(l => if (l >= 0) Attempt.Successful(l) else Attempt.failure(Err(s"overflow for value $l")), l => l)
Expand Down Expand Up @@ -109,7 +104,7 @@ object CommonCodecs {

val ipv4address: Codec[Inet4Address] = bytes(4).xmap(b => InetAddress.getByAddress(b.toArray).asInstanceOf[Inet4Address], a => ByteVector(a.getAddress))

val ipv6address: Codec[Inet6Address] = bytes(16).exmap(b => attemptFromTry(Inet6Address.getByAddress(null, b.toArray, null)), a => attemptFromTry(ByteVector(a.getAddress)))
val ipv6address: Codec[Inet6Address] = bytes(16).exmap(b => Attempt.fromTry(Try(Inet6Address.getByAddress(null, b.toArray, null))), a => Attempt.fromTry(Try(ByteVector(a.getAddress))))
pm47 marked this conversation as resolved.
Show resolved Hide resolved

def base32(size: Int): Codec[String] = bytes(size).xmap(b => new Base32().encodeAsString(b.toArray).toLowerCase, a => ByteVector(new Base32().decode(a.toUpperCase())))

Expand Down