decode

Author: thomash-acinq

eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/OfferTypes.scala

@@ -318,7 +318,7 @@ object OfferTypes {
      * An offer string can be split with '+' to fit in places with a low character limit. This validates that the string adheres to the spec format to guard against copy-pasting errors.
      * @return a lowercase string with '+' and whitespaces removed
      */
-    def validateFormat(s: String): String = {
+    private def validateFormat(s: String): String = {
       val lowercase = s.toLowerCase
       require(s == lowercase || s == s.toUpperCase)
       require(lowercase.head == 'l')

eclair-core/src/test/scala/fr/acinq/eclair/wire/protocol/OfferTypesSpec.scala

@@ -328,13 +328,8 @@ class OfferTypesSpec extends AnyFunSuite {
     val src = Source.fromFile(new File(getClass.getResource(s"/format-string-test.json").getFile))
     val testVectors = JsonMethods.parse(src.mkString).extract[Seq[FormatTestVector]]
     src.close()
-    val canonical = testVectors.head.string
     for (vector <- testVectors) {
-      if (vector.valid) {
-        assert(Offer.validateFormat(vector.string) == canonical, vector.comment)
-      } else {
-        assertThrows[IllegalArgumentException](Offer.validateFormat(vector.string))
-      }
+      assert(Offer.decode(vector.string).isSuccess == vector.valid, vector.comment)
     }
   }
 }