Skip to content

Commit 1edb60b

Browse files
committed
Replaced akka with pekko
1 parent 1f44d66 commit 1edb60b

File tree

72 files changed

+185
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+185
-180
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ inScope(Global)(
185185
testOptions += Tests.Setup(_ => sys.props("sbt-testing") = "true"),
186186
network := Network.default(),
187187
instrumentation := false,
188-
resolvers ++= Resolver.sonatypeOssRepos("releases") ++ Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal, "Akka library repository".at("https://repo.akka.io/maven")),
188+
resolvers ++= Resolver.sonatypeOssRepos("releases") ++ Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal),
189189
Compile / packageDoc / publishArtifact := false,
190190
concurrentRestrictions := Seq(Tags.limit(Tags.Test, math.min(EvaluateTask.SystemProcessors, 8))),
191191
excludeLintKeys ++= Set(

grpc-server/src/main/scala/com/wavesplatform/events/BlockchainUpdates.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class BlockchainUpdates(private val context: Context) extends Extension with Sco
2828
"blockchain-updates",
2929
UncaughtExceptionReporter(err => log.error("Uncaught exception in BlockchainUpdates scheduler", err)),
3030
ExecutionModel.Default,
31-
rejectedExecutionHandler = new akka.dispatch.SaneRejectedExecutionHandler
31+
rejectedExecutionHandler = new org.apache.pekko.dispatch.SaneRejectedExecutionHandler
3232
)
3333
private val rdb = RocksDB.open(context.settings.directory + "/blockchain-updates")
3434
private val repo = new Repo(rdb, context.blocksApi)

node-generator/src/main/scala/com/wavesplatform/generator/Worker.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import monix.execution.Scheduler
1717
import org.asynchttpclient.AsyncHttpClient
1818
import play.api.libs.json.Json
1919

20-
import scala.compat.java8.FutureConverters
20+
import scala.jdk.javaapi.FutureConverters
2121
import scala.concurrent.duration.FiniteDuration
2222
import scala.concurrent.{ExecutionContext, Future}
2323

@@ -56,7 +56,7 @@ class Worker(
5656
import org.asynchttpclient.Dsl.*
5757
val request = get(s"$nodeRestAddress/transactions/unconfirmed/size").build()
5858
Task
59-
.fromFuture(FutureConverters.toScala(httpClient.executeRequest(request).toCompletableFuture))
59+
.fromFuture(FutureConverters.asScala(httpClient.executeRequest(request).toCompletableFuture))
6060
.map(r => math.max(settings.utxLimit - (Json.parse(r.getResponseBody) \ "size").as[Int], 0))
6161
}
6262

@@ -67,7 +67,7 @@ class Worker(
6767
val results = richAccountAddresses.map { address =>
6868
val request = get(s"$nodeRestAddress/addresses/balance/$address").build()
6969
Task
70-
.fromFuture(FutureConverters.toScala(httpClient.executeRequest(request).toCompletableFuture))
70+
.fromFuture(FutureConverters.asScala(httpClient.executeRequest(request).toCompletableFuture))
7171
.map(r => address -> (Json.parse(r.getResponseBody) \ "balance").as[Long])
7272
}
7373
Task.parSequence(results).map(_.toMap)

node-it/src/test/resources/template.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ waves {
109109
}
110110
}
111111

112-
akka.actor.debug {
112+
pekko.actor.debug {
113113
lifecycle = on
114114
unhandled = on
115115
}

node-it/src/test/scala/com/wavesplatform/it/api/SyncHttpApi.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.wavesplatform.it.api
22

33
import java.net.InetSocketAddress
4-
import akka.http.scaladsl.model.StatusCodes.BadRequest
5-
import akka.http.scaladsl.model.{StatusCode, StatusCodes}
4+
import org.apache.pekko.http.scaladsl.model.StatusCodes.BadRequest
5+
import org.apache.pekko.http.scaladsl.model.{StatusCode, StatusCodes}
66
import com.wavesplatform.account.{AddressOrAlias, KeyPair, SeedKeyPair}
77
import com.wavesplatform.api.http.RewardApiRoute.RewardStatus
88
import com.wavesplatform.api.http.requests.IssueRequest

node-it/src/test/scala/com/wavesplatform/it/async/BlockSizeConstraintsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object BlockSizeConstraintsSuite {
4343
private val maxTxsGroup = 500 // More, than 1mb of block
4444
private val maxGroups = 9
4545
private val txsInMicroBlock = 500
46-
private val ConfigOverrides = ConfigFactory.parseString(s"""akka.http.server {
46+
private val ConfigOverrides = ConfigFactory.parseString(s"""pekko.http.server {
4747
| parsing.max-content-length = 3737439
4848
| request-timeout = 60s
4949
|}

node-it/src/test/scala/com/wavesplatform/it/async/WideStateGenerationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class WideStateGenerationSuite extends BaseFreeSpec with WaitForHeight2 with Tra
1515

1616
override protected def createDocker: Docker = new Docker(
1717
suiteConfig = ConfigFactory.parseString(
18-
"""akka.http.server {
18+
"""pekko.http.server {
1919
| parsing.max-content-length = 3737439
2020
| request-timeout = 60s
2121
|}

node-it/src/test/scala/com/wavesplatform/it/sync/transactions/SetAssetScriptTransactionSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.wavesplatform.it.sync.transactions
22

3-
import akka.http.scaladsl.model.StatusCodes
3+
import org.apache.pekko.http.scaladsl.model.StatusCodes
44
import com.wavesplatform.account.KeyPair
55
import com.wavesplatform.api.http.ApiError.{Mistiming, StateCheckFailed, WrongJson}
66
import com.wavesplatform.common.state.ByteStr

node/src/main/resources/application.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,11 @@ waves {
379379

380380
# WARNING: No user-configurable settings below this line.
381381

382-
akka {
382+
pekko {
383383
daemonic = on
384384
loglevel = "INFO"
385-
loggers = ["akka.event.slf4j.Slf4jLogger"]
386-
logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
385+
loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
386+
logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
387387
log-dead-letters-during-shutdown = false
388388

389389
http.server {

node/src/main/resources/network-defaults.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ waves.defaults {
114114
enable = yes
115115
metric.tick-interval = 5s
116116
util.filters {
117-
"akka.tracked-dispatcher" {
117+
"pekko.tracked-dispatcher" {
118118
includes = [
119119
"wavesplatform/**"
120120
]

0 commit comments

Comments
 (0)