Skip to content
This repository was archived by the owner on Apr 13, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import scala.util.Try
name := "scorex-core"

lazy val commonSettings = Seq(
scalaVersion := "2.12.3",
scalaVersion := "2.12.10",
resolvers += Resolver.sonatypeRepo("public"),
wartremoverErrors ++= Seq(
Wart.Recursion,
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/scorex/network/NetworkControllerSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ class TestPeer(settings: ScorexSettings, networkControllerRef: ActorRef, tcpMana
private val messageSpecs = Seq(GetPeersSpec, peersSpec)
private val messagesSerializer = new MessageSerializer(messageSpecs, settings.network.magicBytes)

@SuppressWarnings(Array("org.wartremover.warts.Null"))
private var connectionHandler: ActorRef = _

/**
Expand Down
25 changes: 12 additions & 13 deletions testkit/src/main/scala/scorex/testkit/utils/FileUtils.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package scorex.testkit.utils

import java.io.IOException
import java.nio.file.attribute.BasicFileAttributes
import java.nio.file.{FileVisitResult, Files, Path, SimpleFileVisitor}
import java.nio.file.Path

import org.scalacheck.Gen

Expand Down Expand Up @@ -36,20 +34,21 @@ trait FileUtils {
}

/**
* Recursively remove all files and directories in `root`
* Recursively remove all the files and directories in `root`
*/
def remove(root: Path): Unit = {
Files.walkFileTree(root, new SimpleFileVisitor[Path] {
override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = {
Files.delete(file)
FileVisitResult.CONTINUE
}

override def postVisitDirectory(dir: Path, exc: IOException): FileVisitResult = {
Files.delete(dir)
FileVisitResult.CONTINUE
@SuppressWarnings(Array("org.wartremover.warts.Recursion"))
def deleteRecursive(dir: java.io.File): Unit = {
for (file <- dir.listFiles) {
if (file.isDirectory){
deleteRecursive(file)
}
file.delete()
}
})
}

deleteRecursive(root.toFile)
}

private def createTempDirForPrefix(prefix: String): java.io.File = {
Expand Down