mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-25 07:17:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adding symmetrical serialization specification for UInt32

Browse source
This commit is contained in:
Chris Stewart 2016-06-17 12:18:03 -05:00
parent 9af5077701
commit 3cbf266a3f
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/org/bitcoins/core/number/NumberType.scala
View file

@ -226,7 +226,7 @@ object UInt32 extends Factory[UInt32] with BitcoinSLogger with BaseNumbers[UInt3
UInt32Impl(individualByteValues.sum.toLong, BitcoinSUtil.encodeHex(bytes))
}
def apply(long : Long) : UInt32 = UInt32Impl(long, BitcoinSUtil.encodeHex(BigInt(long).toByteArray))
def apply(long : Long) : UInt32 = UInt32Impl(long, BitcoinSUtil.encodeHex(long))
}

10
src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala
View file

@ -28,6 +28,16 @@ trait BitcoinSUtil extends NumberUtil {
def encodeHex(byte : Byte) : String = encodeHex(Seq(byte))
/**
* Encodes a long number to a hex string, pads it with an extra '0' char
* if the hex string is an odd amount of characters
* @param long
* @return
*/
def encodeHex(long : Long) : String = long.toHexString.length % 2 match {
case 1 => "0" + long.toHexString
case _ : Int => long.toHexString
}
/**
* Tests if a given string is a hexadecimal string
* @param str

9
src/test/scala/org/bitcoins/core/number/UInt32Specification.scala
View file

@ -94,5 +94,12 @@ class UInt32Specification extends Properties("UInt32") with BitcoinSLogger {
else num1 != num2
}
}
property("serialization symmetry") = {
Prop.forAll(NumberGenerator.uInt32s) { uInt32 : UInt32 =>
UInt32(uInt32.hex) == uInt32
UInt32(uInt32.hex).hex == uInt32.hex
}
}
}