refactor byte strings

ton-community · Feb 21, 2024 · 7eb82e9 · 7eb82e9
1 parent f6a756e
commit 7eb82e9
Show file tree

Hide file tree

Showing 97 changed files with 431 additions and 907 deletions.
diff --git a/adnl/src/Adnl.kt b/adnl/src/Adnl.kt
diff --git a/adnl/src/AdnlPeers.kt b/adnl/src/AdnlPeers.kt
diff --git a/adnl/src/connection/AdnlClient.kt b/adnl/src/connection/AdnlClient.kt
@@ -1,8 +1,7 @@
 package org.ton.adnl.connection
 
-import io.ktor.utils.io.core.*
 import kotlin.time.Duration
 
 public interface AdnlClient {
-    public suspend fun sendQuery(data: ByteReadPacket, timeout: Duration): ByteReadPacket
+    public suspend fun sendQuery(data: ByteArray, timeout: Duration): ByteArray
 }
diff --git a/adnl/src/connection/AdnlClientImpl.kt b/adnl/src/connection/AdnlClientImpl.kt
@@ -3,39 +3,33 @@ package org.ton.adnl.connection
 import io.ktor.utils.io.core.*
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.withTimeout
+import kotlinx.io.bytestring.ByteString
 import org.ton.api.adnl.message.AdnlMessageAnswer
 import org.ton.api.adnl.message.AdnlMessageQuery
 import org.ton.api.liteserver.LiteServerDesc
-import org.ton.tl.ByteString
-import org.ton.tl.asByteString
 import kotlin.random.Random
 import kotlin.time.Duration
 
 public class AdnlClientImpl(
     private val liteServerDesc: LiteServerDesc
 ) : AdnlClient {
-    override suspend fun sendQuery(data: ByteReadPacket, timeout: Duration): ByteReadPacket {
+    override suspend fun sendQuery(data: ByteArray, timeout: Duration): ByteArray {
         val adnlConnection = connectionPool.selectConnection(liteServerDesc)
-        val queryId = ByteString.of(*Random.nextBytes(32))
+        val queryId = ByteString(*Random.nextBytes(32))
         val context = SupervisorJob()
-        val queryData = data.readBytes()
         try {
             return withTimeout(timeout) {
                 val response = adnlConnection.execute(
                     AdnlRequestData(
-                        buildPacket {
-                            AdnlMessageQuery.encodeBoxed(
-                                this, AdnlMessageQuery(queryId, queryData.asByteString())
-                            )
-                        }.readBytes(),
+                        AdnlMessageQuery.encodeToByteArray(
+                            AdnlMessageQuery(queryId, ByteString(*data)), true
+                        ),
                         context
                     ), context
                 )
-                ByteReadPacket(
-                    AdnlMessageAnswer.decodeBoxed(
-                        response.body
-                    ).answer.toByteArray()
-                )
+                AdnlMessageAnswer.decodeBoxed(
+                    response.body.readBytes()
+                ).answer.toByteArray()
             }
         } catch (e: Throwable) {
             throw e

diff --git a/adnl/src/connection/AdnlConnection.kt b/adnl/src/connection/AdnlConnection.kt
@@ -14,7 +14,6 @@ import kotlinx.datetime.Instant
 import org.ton.adnl.network.TcpClient
 import org.ton.api.liteserver.LiteServerDesc
 import org.ton.crypto.SecureRandom
-import org.ton.tl.writeByteString
 import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.ZERO
@@ -67,7 +66,7 @@ public class AdnlConnection(
             }
 
             connection.output.writePacket {
-                writeByteString(liteServerDesc.id.toAdnlIdShort().id)
+                writeFully(liteServerDesc.id.toAdnlIdShort().id.toByteArray())
                 writeFully(liteServerDesc.id.encrypt(nonce))
             }
             connection.output.flush()
@@ -185,8 +184,8 @@ public class AdnlConnection(
         val payload = packet.readBytes()
 
         val hash = SHA256().apply {
-            write(nonce)
-            write(payload)
+            update(nonce)
+            update(payload)
         }.digest()
 
         val data = buildPacket {

diff --git a/adnl/src/network/IPAddress.kt b/adnl/src/network/IPAddress.kt
@@ -1,5 +1,6 @@
 package org.ton.adnl.network
 
+import kotlinx.io.bytestring.ByteString
 import org.ton.adnl.ipv4
 import org.ton.api.adnl.AdnlAddress
 import org.ton.api.adnl.AdnlAddressUdp
@@ -54,7 +55,7 @@ public data class IPv6Address(
     override val host: String
         get() = TODO()
 
-    override fun toAdnlAddress(): AdnlAddressUdp6 = AdnlAddressUdp6(address, port)
+    override fun toAdnlAddress(): AdnlAddressUdp6 = AdnlAddressUdp6(ByteString(address), port)
 
     override fun toString(): String = "$host:$port"
 }
diff --git a/adnl/src/peer/AdnlMessagePartDecoder.kt b/adnl/src/peer/AdnlMessagePartDecoder.kt