Skip to content
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

Jump to bottom

Fix ErgoStateContextSpec Sporadic Failures #2116

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Fix ErgoStateContextSpec Sporadic Failures #2116

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
d37d0f9
fix ErgoStateContextSpec sporadic failure
stenolog Feb 22, 2024
46f7f98
provide alternate test-generators
stenolog Mar 4, 2024
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
26 changes: 26 additions & 0 deletions ergo-core/src/test/scala/org/ergoplatform/utils/generators/ErgoCoreGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,37 @@ object ErgoCoreGenerators {
scorex.util.Random.randomBytes
}

/**
* Main KV generator: contains special handling for key.head == 0
*/
def extensionKvGen(keySize: Int, valuesSize: Int): Gen[(Array[Byte], Array[Byte])] = for {
key <- genSecureBoundedBytes(keySize, keySize)
value <- if (key.head == 0) genSecureBoundedBytes(4, 4) else genSecureBoundedBytes(valuesSize, valuesSize)
} yield (key, value)

/**
* Random KV generator: all random key/values
*/
def extensionKvGenImvValue(keySize: Int, valuesSize: Int): Gen[(Array[Byte], Array[Byte])] = for {
key <- genSecureBoundedBytes(keySize, keySize)
value <- genSecureBoundedBytes(valuesSize, valuesSize)
} yield (key, value)

/**
* Special KV generator: does not generate key.head == 1, because improperly packed interlink
* would be generated, leading to failure.
*/
def extensionKvGenValidMKV(keySize: Int, valueSize: Int): Gen[(Array[Byte], Array[Byte])] = {
def keyGenHeadNotOne: Gen[Array[Byte]] = genSecureBoundedBytes(keySize, keySize).flatMap { key =>
if (key.headOption.contains(1.toByte)) keyGenHeadNotOne else Gen.const(key)
}

for {
key <- keyGenHeadNotOne
value <- genSecureBoundedBytes(valueSize, valueSize)
} yield (key, value)
}

lazy val extensionGen: Gen[Extension] = for {
headerId <- modifierIdGen
mandatoryElements <- Gen.mapOf(extensionKvGen(Extension.FieldKeySize, Extension.FieldValueMaxSize))
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/org/ergoplatform/nodeView/state/ErgoStateContextSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ErgoStateContextSpec extends ErgoCorePropertyTest {
sc.appendFullBlock(fbWithFields(imvKey +: oldFields)) shouldBe 'failure

// validation of field value sizes
val imvValue = extensionKvGen(Extension.FieldKeySize, Extension.FieldValueMaxSize + 1).sample.get
val imvValue = extensionKvGenImvValue(Extension.FieldKeySize, Extension.FieldValueMaxSize + 1).sample.get
sc.appendFullBlock(fbWithFields(imvValue +: oldFields)) shouldBe 'failure

// validation of incorrect interlinks
Expand All @@ -76,8 +76,8 @@ class ErgoStateContextSpec extends ErgoCorePropertyTest {
).fields
sc.appendFullBlock(fbWithFields(invalidInterlinks ++ oldFields)) shouldBe 'failure

val validMKV = extensionKvGenValidMKV(Extension.FieldKeySize, Extension.FieldValueMaxSize).sample.get
// validation of key duplicates in fields
val validMKV = extensionKvGen(Extension.FieldKeySize, Extension.FieldValueMaxSize).sample.get
sc.appendFullBlock(fbWithFields(Seq(validMKV, validMKV) ++ oldFields)) shouldBe 'failure

// valid application of correct extension
Expand Down
Loading