diff --git a/README.md b/README.md index 48e7b8d..64c6ea1 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,7 @@ given HexEncode[Array[Byte]] = new HexEncode[Array[Byte]] { } given HexDecode[Array[Byte]] = new HexDecode[Array[Byte]] { - def fromHexString(data: String): Option[Array[Byte]] = - Hex.fromHexString(data) + def fromHexString(data: String): Option[Array[Byte]] = Hex.fromHexString(data) } ``` @@ -61,10 +60,10 @@ given HexDecode[Array[Byte]] = new HexDecode[Array[Byte]] { ```scala def encode[A](data: A)(using HexEncode[A]): String = - data.toHex() + Hex.toHexString(dataToBytes(data)) def decode[A](data: String)(using HexDecode[A]): Option[A] = - data.fromHex() + Hex.fromHexString(data).map(dataFromBytes) ``` ## Donate diff --git a/src/main/scala/gs/hex/v0/HexDecode.scala b/src/main/scala/gs/hex/v0/HexDecode.scala index f83685e..e930b47 100644 --- a/src/main/scala/gs/hex/v0/HexDecode.scala +++ b/src/main/scala/gs/hex/v0/HexDecode.scala @@ -13,8 +13,6 @@ trait HexDecode[A]: */ def fromHexString(data: String): Option[A] - extension (data: String) def fromHex(): Option[A] = fromHexString(data) - object HexDecode: /** Retrieve the [[HexDecode]] instance for the given type. diff --git a/src/main/scala/gs/hex/v0/HexEncode.scala b/src/main/scala/gs/hex/v0/HexEncode.scala index fe0fb06..05a30dd 100644 --- a/src/main/scala/gs/hex/v0/HexEncode.scala +++ b/src/main/scala/gs/hex/v0/HexEncode.scala @@ -12,8 +12,6 @@ trait HexEncode[A]: */ def toHexString(data: A): String - extension (data: A) def toHex(): String = toHexString(data) - object HexEncode: /** Retrieve the [[HexEncode]] instance for the given type. diff --git a/src/test/scala/gs/blob/v0/EncodeDecodeTests.scala b/src/test/scala/gs/blob/v0/EncodeDecodeTests.scala index 910d924..b71d908 100644 --- a/src/test/scala/gs/blob/v0/EncodeDecodeTests.scala +++ b/src/test/scala/gs/blob/v0/EncodeDecodeTests.scala @@ -89,15 +89,15 @@ class EncodeDecodeTests extends munit.FunSuite: data: A )( using - HexEncode[A] - ): String = data.toHex() + H: HexEncode[A] + ): String = H.toHexString(data) private def decode[A]( data: String )( using - HexDecode[A] - ): Option[A] = data.fromHex() + H: HexDecode[A] + ): Option[A] = H.fromHexString(data) private def randomByteArray(): Array[Byte] = val length = Rng.nextInt(MaxLength) + MinLength