upgraded result lib to 2.0.0 (#5)

CharlieTap · Apr 2, 2024 · 19fd910 · 19fd910
1 parent 5e418f4
commit 19fd910
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/...o/github/charlietap/chasm/decoder/wasm/decoder/instruction/BinaryExpressionDecoderTest.kt b/...o/github/charlietap/chasm/decoder/wasm/decoder/instruction/BinaryExpressionDecoderTest.kt
@@ -20,7 +20,7 @@ class BinaryExpressionDecoderTest {
         }
         val expected = Ok(Expression(NumericInstruction.I32Eqz))
 
-        val actual = io.github.charlietap.chasm.decoder.wasm.decoder.instruction.BinaryExpressionDecoder(
+        val actual = BinaryExpressionDecoder(
             FakeWasmBinaryReader(),
             instructionBlockDecoder,
         )
@@ -34,7 +34,7 @@ class BinaryExpressionDecoderTest {
         val err = ioError()
         val reader = IOErrorWasmFileReader(err)
 
-        val actual = io.github.charlietap.chasm.decoder.wasm.decoder.instruction.BinaryExpressionDecoder(reader)
+        val actual = BinaryExpressionDecoder(reader)
 
         assertEquals(err, actual)
     }

diff --git a/.../io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryGenericVectorDecoderTest.kt b/.../io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryGenericVectorDecoderTest.kt
@@ -4,7 +4,7 @@ import com.github.michaelbull.result.Ok
 import io.github.charlietap.chasm.ast.value.NameValue
 import io.github.charlietap.chasm.decoder.wasm.decoder.value.name.NameValueDecoder
 import io.github.charlietap.chasm.decoder.wasm.fixture.ioError
-import io.github.charlietap.chasm.decoder.wasm.reader.FakeWasmBinaryReader
+import io.github.charlietap.chasm.decoder.wasm.reader.FakeUIntReader
 import io.github.charlietap.chasm.decoder.wasm.reader.IOErrorWasmFileReader
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -20,8 +20,7 @@ class BinaryGenericVectorDecoderTest {
         )
         val expected = Ok(Vector(expectedNames))
 
-        val int: () -> Ok<UInt> = { Ok(2u) }
-        val reader = FakeWasmBinaryReader(fakeUIntReader = int)
+        val reader = FakeUIntReader { Ok(2u) }
 
         val names = sequenceOf(NameValue("one"), NameValue("two")).iterator()
         val subDecoder: NameValueDecoder = {

diff --git a/.../kotlin/io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryVectorDecoderTest.kt b/.../kotlin/io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryVectorDecoderTest.kt
@@ -1,6 +1,8 @@
 package io.github.charlietap.chasm.decoder.wasm.decoder.vector
 
 import com.github.michaelbull.result.Ok
+import com.github.michaelbull.result.Result
+import io.github.charlietap.chasm.decoder.wasm.error.WasmDecodeError
 import io.github.charlietap.chasm.decoder.wasm.fixture.ioError
 import io.github.charlietap.chasm.decoder.wasm.reader.FakeWasmBinaryReader
 import io.github.charlietap.chasm.decoder.wasm.reader.IOErrorWasmFileReader
@@ -14,8 +16,8 @@ class BinaryVectorDecoderTest {
 
         val expected = Ok(ByteVector(VALID_VECTOR, 16u))
 
-        val int: () -> Ok<UInt> = { Ok(16u) }
-        val bytes: (UInt) -> Ok<UByteArray> = { _ -> Ok(VALID_VECTOR) }
+        val int: () -> Result<UInt, WasmDecodeError> = { Ok(16u) }
+        val bytes: (UInt) -> Result<UByteArray, WasmDecodeError> = { _ -> Ok(VALID_VECTOR) }
 
         val reader = FakeWasmBinaryReader(fakeUBytesReader = bytes, fakeUIntReader = int)
 

diff --git a/...n/io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryVectorLengthDecoderTest.kt b/...n/io/github/charlietap/chasm/decoder/wasm/decoder/vector/BinaryVectorLengthDecoderTest.kt
@@ -2,7 +2,7 @@ package io.github.charlietap.chasm.decoder.wasm.decoder.vector
 
 import com.github.michaelbull.result.Ok
 import io.github.charlietap.chasm.decoder.wasm.fixture.ioError
-import io.github.charlietap.chasm.decoder.wasm.reader.FakeWasmBinaryReader
+import io.github.charlietap.chasm.decoder.wasm.reader.FakeUIntReader
 import io.github.charlietap.chasm.decoder.wasm.reader.IOErrorWasmFileReader
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -14,8 +14,7 @@ class BinaryVectorLengthDecoderTest {
 
         val expected = Ok(VectorLength(16u))
 
-        val int: () -> Ok<UInt> = { Ok(16u) }
-        val reader = FakeWasmBinaryReader(fakeUIntReader = int)
+        val reader = FakeUIntReader { Ok(16u) }
 
         val actual = BinaryVectorLengthDecoder(reader)
 

diff --git a/...mmonTest/kotlin/io/github/charlietap/chasm/decoder/wasm/reader/IOErrorWasmBinaryReader.kt b/...mmonTest/kotlin/io/github/charlietap/chasm/decoder/wasm/reader/IOErrorWasmBinaryReader.kt
@@ -1,10 +1,9 @@
 package io.github.charlietap.chasm.decoder.wasm.reader
 
-import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Result
 import io.github.charlietap.chasm.decoder.wasm.error.WasmDecodeError
 
-internal fun IOErrorWasmFileReader(err: Err<WasmDecodeError.IOError>): WasmBinaryReader = object : WasmBinaryReader {
+internal fun IOErrorWasmFileReader(err: Result<Nothing, WasmDecodeError.IOError>): WasmBinaryReader = object : WasmBinaryReader {
 
     override fun byte(): Result<Byte, WasmDecodeError> = err
 

diff --git a/...nTest/kotlin/io/github/charlietap/chasm/decoder/wasm/reader/SourceWasmBinaryReaderTest.kt b/...nTest/kotlin/io/github/charlietap/chasm/decoder/wasm/reader/SourceWasmBinaryReaderTest.kt
@@ -1,7 +1,9 @@
 package io.github.charlietap.chasm.decoder.wasm.reader
 
 import com.github.michaelbull.result.Ok
+import com.github.michaelbull.result.Result
 import io.github.charlietap.chasm.decoder.wasm.const.Leb128
+import io.github.charlietap.chasm.decoder.wasm.error.WasmDecodeError
 import io.github.charlietap.chasm.decoder.wasm.fixture.ioError
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -10,7 +12,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read a byte from source and forward it on`() {
-        val expected: Ok<Byte> = Ok(0x01)
+        val expected: Result<Byte, WasmDecodeError> = Ok(0x01)
         val sourceReader = FakeByteSourceReader {
             expected.value
         }
@@ -34,7 +36,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read a ubyte from source and forward it on`() {
-        val expected: Ok<UByte> = Ok(0x01u)
+        val expected: Result<UByte, WasmDecodeError> = Ok(0x01u)
         val sourceReader = FakeByteSourceReader {
             expected.value.toByte()
         }
@@ -58,7 +60,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read bytes from source and forward them on`() {
-        val expected: Ok<ByteArray> = Ok(byteArrayOf(0x01, 0x02))
+        val expected: Result<ByteArray, WasmDecodeError> = Ok(byteArrayOf(0x01, 0x02))
         val sourceReader = FakeByteArraySourceReader { amount ->
             assertEquals(2, amount)
             expected.value
@@ -83,7 +85,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read ubytes from source and forward them on`() {
-        val expected: Ok<UByteArray> = Ok(ubyteArrayOf(0x01u, 0x02u))
+        val expected: Result<UByteArray, WasmDecodeError> = Ok(ubyteArrayOf(0x01u, 0x02u))
         val sourceReader = FakeByteArraySourceReader { amount ->
             assertEquals(2, amount)
             expected.value.asByteArray()
@@ -108,7 +110,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read a leb128 encoded int and forward it on`() {
-        val expected: Ok<Int> = Ok(128)
+        val expected: Result<Int, WasmDecodeError> = Ok(128)
         val source = Leb128.Integer.TWO_BYTES_SIGNED_POSITIVE.asSequence().iterator()
         val sourceReader = FakeByteSourceReader {
             source.next()
@@ -133,7 +135,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read a leb128 encoded uint and forward it on`() {
-        val expected: Ok<UInt> = Ok(128u)
+        val expected: Result<UInt, WasmDecodeError> = Ok(128u)
         val source = Leb128.Integer.TWO_BYTES_UNSIGNED.asSequence().iterator()
         val sourceReader = FakeByteSourceReader {
             source.next().toByte()
@@ -158,7 +160,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read a leb128 encoded long and forward it on`() {
-        val expected: Ok<Long> = Ok(Long.MAX_VALUE)
+        val expected: Result<Long, WasmDecodeError> = Ok(Long.MAX_VALUE)
         val source = Leb128.Long.TEN_BYTES_SIGNED_POSITIVE.asSequence().iterator()
         val sourceReader = FakeByteSourceReader {
             source.next()
@@ -183,7 +185,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read an IEEE 754 encoded float and forward it on`() {
-        val expected: Ok<Float> = Ok(1.5f)
+        val expected: Result<Float, WasmDecodeError> = Ok(1.5f)
         val sourceReader = FakeByteArraySourceReader {
             byteArrayOf(0x00.toByte(), 0x00.toByte(), 0xC0.toByte(), 0x3F.toByte())
         }
@@ -207,7 +209,7 @@ class SourceWasmBinaryReaderTest {
 
     @Test
     fun `can read an IEEE 754 encoded double and forward it on`() {
-        val expected: Ok<Double> = Ok(12345.6789)
+        val expected: Result<Double, WasmDecodeError> = Ok(12345.6789)
         val sourceReader = FakeByteArraySourceReader {
             byteArrayOf(161.toByte(), 248.toByte(), 49.toByte(), 230.toByte(), 214.toByte(), 28.toByte(), 200.toByte(), 64.toByte())
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ kotlinx-io = "0.3.1"
 kotlinx-serialization = "1.5.1"
 kotlinx-test-resources = "0.4.1"
 
-result = "1.1.18"
+result = "2.0.0"
 
 [plugins]