Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
nzpr committed Sep 6, 2022
1 parent 7227a7e commit 7779b89
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
18 changes: 13 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ lazy val projectSettings = Seq(
version := "0.1.0-SNAPSHOT",
resolvers ++=
Resolver.sonatypeOssRepos("releases") ++
Resolver.sonatypeOssRepos("snapshots") ++
Seq("jitpack" at "https://jitpack.io"),
Resolver.sonatypeOssRepos("snapshots") ++
Seq("jitpack" at "https://jitpack.io"),
wartremoverExcluded += sourceManaged.value,
Compile / compile / wartremoverErrors ++= Warts.allBut(
// those we want
Expand Down Expand Up @@ -76,7 +76,7 @@ lazy val projectSettings = Seq(
Seq(
Compile / packageDoc / publishArtifact := false,
packageDoc / publishArtifact := false,
Compile / doc / sources := Seq.empty,
Compile / doc / sources := Seq.empty
)
}

Expand Down Expand Up @@ -346,6 +346,14 @@ lazy val node = (project in file("node"))
ExecCmd("CMD", "run")
)
},
Docker / dockerBuildCommand := Seq(
"docker",
"buildx",
"build",
".",
"--platform=linux/amd64", //"--platform=linux/amd64,linux/arm64"
"--load"
),
// Replace unsupported character `+`
Docker / version := { version.value.replace("+", "__") },
Docker / mappings ++= {
Expand Down Expand Up @@ -379,7 +387,7 @@ lazy val node = (project in file("node"))
rpmUrl := Some("https://rchain.coop"),
rpmLicense := Some("Apache 2.0"),
Rpm / packageArchitecture := "noarch",
Rpm / maintainerScripts := maintainerScriptsAppendFromFile((Rpm/maintainerScripts).value)(
Rpm / maintainerScripts := maintainerScriptsAppendFromFile((Rpm / maintainerScripts).value)(
RpmConstants.Post -> (sourceDirectory.value / "rpm" / "scriptlets" / "post")
),
rpmPrerequisites := Seq(
Expand Down Expand Up @@ -410,7 +418,7 @@ lazy val rholang = (project in file("rholang"))
"-Xfatal-warnings",
"-Xlint:_,-missing-interpolator" // disable "possible missing interpolator" warning
),
Compile / packageDoc/ publishArtifact := false,
Compile / packageDoc / publishArtifact := false,
packageDoc / publishArtifact := false,
Compile / doc / sources := Seq.empty,
libraryDependencies ++= commonDependencies ++ Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,10 @@ object BlockReceiver {
next <- state.modify(_.finished(block.blockHash, parents))

// Send dependency free blocks to validation
_ <- next.toList.traverse_(receiverOutputQueue.enqueue1)
dag <- BlockDagStorage[F].getRepresentation
msgs <- next.toList.traverse(BlockStore[F].getUnsafe)
depFree = msgs.filter(_.justifications.forall(dag.contains)).map(_.blockHash)
_ <- depFree.traverse_(receiverOutputQueue.enqueue1)
} yield ()
}

Expand Down

0 comments on commit 7779b89

Please sign in to comment.