From 7846eef30941e20729b113e3415159adfd640624 Mon Sep 17 00:00:00 2001
From: Minyong Li <ml10g20@soton.ac.uk>
Date: Wed, 16 Jun 2021 01:31:16 +0100
Subject: [PATCH] core.*Test: various tiny style fixes
---
.../scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala | 3 ---
src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala | 1 -
.../scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala | 5 ++---
.../scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala | 2 --
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
index 0db33b6..5b0ffd9 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
@@ -5,7 +5,6 @@ import chiseltest._
import chisel3._
class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
-
private val rfc8439232TestVector = Seq(
"h61707865".U(32.W) -> "he4e7f110".U(32.W),
"h3320646e".U(32.W) -> "h15593bd1".U(32.W),
@@ -24,7 +23,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
"h4a000000".U(32.W) -> "he883d0cb".U(32.W),
"h00000000".U(32.W) -> "h4e3c50a2".U(32.W)
)
-
private val rfc8439242B1TestVector = Seq(
"h61707865".U(32.W) -> "hf3514f22".U(32.W),
"h3320646e".U(32.W) -> "he1d91b40".U(32.W),
@@ -43,7 +41,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
"h4a000000".U(32.W) -> "h4c2c21ea".U(32.W),
"h00000000".U(32.W) -> "hb7417df0".U(32.W)
)
-
private val rfc8439242B2TestVector = Seq(
"h61707865".U(32.W) -> "h9f74a669".U(32.W),
"h3320646e".U(32.W) -> "h410f633f".U(32.W),
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
index 3ea68b3..18184e3 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
@@ -50,5 +50,4 @@ class DataMemoryTest extends FlatSpec with ChiselScalatestTester {
c.io.read.data.expect("hcafe".U(dataWidth.W))
}
}
-
}
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
index 6fce452..118d902 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
@@ -60,7 +60,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
}
}
- it should "correctly do relative branch" in {
+ it should "do relative branching correctly" in {
test(new ProgramMemory(addrWidth, cwWidth, size)) { c =>
c.io.br.abs.poke(false.B)
c.io.br.rel.poke(false.B)
@@ -100,7 +100,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
}
}
- it should "do absolute branch correctly" in {
+ it should "do absolute branching correctly" in {
test(new ProgramMemory(addrWidth, cwWidth, size)) { c =>
c.io.br.abs.poke(false.B)
c.io.br.rel.poke(false.B)
@@ -136,5 +136,4 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
}
}
}
-
}
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
index 0cc37f7..e1821be 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
@@ -8,7 +8,6 @@ import chiseltest._
import chisel3._
class QuarterRoundTest extends FlatSpec with ChiselScalatestTester {
-
it should "compute RFC8439 2.1.1 test vector correctly" in {
test(new QuarterRound) { c =>
c.io.in(0).poke("h11111111".U(32.W))
@@ -36,5 +35,4 @@ class QuarterRoundTest extends FlatSpec with ChiselScalatestTester {
c.io.out(3).expect("hccc07c79".U(32.W))
}
}
-
}
--
GitLab