Skip to content

[ETCM-354] Bump cats version #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 22, 2021
Merged

[ETCM-354] Bump cats version #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7884e
[ETCM-354] Bump cats version
lukasz-golebiewski Jun 22, 2021
47155b6
[ETCM-354] Update nix-sbt sha
lukasz-golebiewski Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nix/overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rev: final: prev: {

mantis = final.callPackage ./mantis.nix {
src = ../.;
depsSha256 = "sha256-US4L/xh2otnEfOa05bazb14bgYhQZpF4GfFY30sDkNY=";
depsSha256 = "sha256-QXIsF46M9gKhLD8EWMsyxDRWQNzgzWv3pctRJEEHbYM=";
};

mantis-hash = final.mantis.override {
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ object Dependencies {
)

val cats: Seq[ModuleID] = {
val catsVersion = "2.2.0"
val catsVersion = "2.6.1"
Seq(
"org.typelevel" %% "mouse" % "0.25",
"org.typelevel" %% "cats-core" % catsVersion,
"org.typelevel" %% "cats-effect" % catsVersion
"org.typelevel" %% "cats-effect" % "2.5.1"
)
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/io/iohk/ethereum/network/discovery/DiscoveryServiceBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ trait DiscoveryServiceBuilder {
implicit val enrContentCodec = RLPCodecs.codecFromRLPCodec(RLPCodecs.enrContentRLPCodec)

val resource = for {
host <- Resource.liftF {
host <- Resource.eval {
getExternalAddress(discoveryConfig)
}
localNode = ENode(
Expand All @@ -48,13 +48,13 @@ trait DiscoveryServiceBuilder {
tcpPort = tcpPort
)
)
v4Config <- Resource.liftF {
v4Config <- Resource.eval {
makeDiscoveryConfig(discoveryConfig, knownNodesStorage)
}
udpConfig = makeUdpConfig(discoveryConfig, host)
network <- makeDiscoveryNetwork(privateKey, localNode, v4Config, udpConfig)
service <- makeDiscoveryService(privateKey, localNode, v4Config, network)
_ <- Resource.liftF {
_ <- Resource.eval {
setDiscoveryStatus(nodeStatusHolder, ServerStatus.Listening(udpConfig.bindAddress))
}
} yield service
Expand Down Expand Up @@ -142,7 +142,7 @@ trait DiscoveryServiceBuilder {
): Resource[Task, v4.DiscoveryNetwork[InetMultiAddress]] =
for {
peerGroup <- StaticUDPPeerGroup[v4.Packet](udpConfig)
network <- Resource.liftF {
network <- Resource.eval {
v4.DiscoveryNetwork[InetMultiAddress](
peerGroup = peerGroup,
privateKey = privateKey,
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManagerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class PeerDiscoveryManagerSpec
@volatile var started = false

override lazy val discoveryServiceResource: Resource[Task, DiscoveryService] =
Resource.liftF {
Resource.eval {
Task { started = true } >>
Task.raiseError[DiscoveryService](new RuntimeException("Oh no!") with NoStackTrace)
}
Expand Down