mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-18 05:13:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: Rework NetworkPayload traits to use Vector instead of Seq for methods (#5845)

Browse Source
This commit is contained in:
Chris Stewart 2025-01-15 11:17:39 -06:00 committed by GitHub
parent a94fc3a92d
commit 07270ba8ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-test/src/test/scala/org/bitcoins/core/p2p/GetDataMessageTest.scala
View File

@ -20,7 +20,7 @@ class GetDataMessageTest extends BitcoinSUnitTest {
it must "be constructable from a single inventory" in {
val inventory = Inventory(TypeIdentifier.MsgBlock, DoubleSha256Digest.empty)
assert(GetDataMessage(inventory) == GetDataMessage(Seq(inventory)))
assert(GetDataMessage(inventory) == GetDataMessage(Vector(inventory)))
}
it must "have a meaningful toString" in {

2
core-test/src/test/scala/org/bitcoins/core/p2p/GetHeadersMessageTest.scala
View File

@ -26,7 +26,7 @@ class GetHeadersMessageTest extends BitcoinSUnitTest {
def getHash(): DoubleSha256Digest =
CryptoGenerators.doubleSha256Digest.sampleSome
val msg = GetHeadersMessage(List.fill(10)(getHash()))
val msg = GetHeadersMessage(Vector.fill(10)(getHash()))
assert(msg.hashStop == DoubleSha256Digest.empty)
val hash = getHash()

40
core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
View File

@ -80,7 +80,7 @@ trait GetBlocksMessage extends DataPayload with ExpectsResponse {
* highest-height hashes are listed first and lowest-height hashes are listed
* last.
*/
def blockHeaderHashes: Seq[DoubleSha256Digest]
def blockHeaderHashes: Vector[DoubleSha256Digest]
/** The header hash of the last header hash being requested; set to all zeroes
* to request an inv message with all subsequent header hashes (a maximum of
@ -105,21 +105,21 @@ object GetBlocksMessage extends Factory[GetBlocksMessage] {
private case class GetBlocksMessageImpl(
protocolVersion: ProtocolVersion,
hashCount: CompactSizeUInt,
blockHeaderHashes: Seq[DoubleSha256Digest],
blockHeaderHashes: Vector[DoubleSha256Digest],
stopHash: DoubleSha256Digest)
extends GetBlocksMessage
def apply(
version: ProtocolVersion,
hashCount: CompactSizeUInt,
blockHeaderHashes: Seq[DoubleSha256Digest],
blockHeaderHashes: Vector[DoubleSha256Digest],
stopHash: DoubleSha256Digest): GetBlocksMessage = {
GetBlocksMessageImpl(version, hashCount, blockHeaderHashes, stopHash)
}
def apply(
version: ProtocolVersion,
blockHeaderHashes: Seq[DoubleSha256Digest],
blockHeaderHashes: Vector[DoubleSha256Digest],
stopHash: DoubleSha256Digest): GetBlocksMessage = {
val hashCount = CompactSizeUInt(UInt64(blockHeaderHashes.length))
GetBlocksMessage(version, hashCount, blockHeaderHashes, stopHash)
@ -143,7 +143,7 @@ object GetBlocksMessage extends Factory[GetBlocksMessage] {
*/
case class GetDataMessage(
inventoryCount: CompactSizeUInt,
inventories: Seq[Inventory])
inventories: Vector[Inventory])
extends DataPayload {
override def commandName = NetworkPayload.getDataCommandName
@ -166,13 +166,13 @@ object GetDataMessage extends Factory[GetDataMessage] {
RawGetDataMessageSerializer.read(bytes)
}
def apply(inventories: Seq[Inventory]): GetDataMessage = {
def apply(inventories: Vector[Inventory]): GetDataMessage = {
val inventoryCount = CompactSizeUInt(UInt64(inventories.length))
GetDataMessage(inventoryCount, inventories)
}
def apply(inventory: Inventory): GetDataMessage =
GetDataMessage(Seq(inventory))
GetDataMessage(Vector(inventory))
}
sealed trait ExpectsResponse {
@ -199,7 +199,7 @@ sealed trait ExpectsResponse {
trait GetHeadersMessage extends DataPayload with ExpectsResponse {
def version: ProtocolVersion
def hashCount: CompactSizeUInt
def hashes: Seq[DoubleSha256Digest]
def hashes: Vector[DoubleSha256Digest]
def hashStop: DoubleSha256Digest
override def commandName = NetworkPayload.getHeadersCommandName
@ -223,7 +223,7 @@ object GetHeadersMessage extends Factory[GetHeadersMessage] {
private case class GetHeadersMessageImpl(
version: ProtocolVersion,
hashCount: CompactSizeUInt,
hashes: Seq[DoubleSha256Digest],
hashes: Vector[DoubleSha256Digest],
hashStop: DoubleSha256Digest)
extends GetHeadersMessage
@ -233,14 +233,14 @@ object GetHeadersMessage extends Factory[GetHeadersMessage] {
def apply(
version: ProtocolVersion,
hashCount: CompactSizeUInt,
hashes: Seq[DoubleSha256Digest],
hashes: Vector[DoubleSha256Digest],
hashStop: DoubleSha256Digest): GetHeadersMessage = {
GetHeadersMessageImpl(version, hashCount, hashes, hashStop)
}
def apply(
version: ProtocolVersion,
hashes: Seq[DoubleSha256Digest],
hashes: Vector[DoubleSha256Digest],
hashStop: DoubleSha256Digest): GetHeadersMessage = {
val hashCount = CompactSizeUInt(UInt64(hashes.length))
GetHeadersMessage(version, hashCount, hashes, hashStop)
@ -248,7 +248,7 @@ object GetHeadersMessage extends Factory[GetHeadersMessage] {
/** Creates a [[GetHeadersMessage]] with the default protocol version */
def apply(
hashes: Seq[DoubleSha256Digest],
hashes: Vector[DoubleSha256Digest],
hashStop: DoubleSha256Digest): GetHeadersMessage = {
GetHeadersMessage(ProtocolVersion.default, hashes, hashStop)
}
@ -260,7 +260,7 @@ object GetHeadersMessage extends Factory[GetHeadersMessage] {
* @see
* [[https://bitcoin.org/en/developer-reference#getheaders]]
*/
def apply(hashes: Seq[DoubleSha256Digest]): GetHeadersMessage = {
def apply(hashes: Vector[DoubleSha256Digest]): GetHeadersMessage = {
// The header hash of the last header hash being requested; set to all zeroes to request an inv message with all
// subsequent header hashes (a maximum of 2000 will be sent as a reply to this message
val hashStop = DoubleSha256Digest.empty
@ -340,7 +340,7 @@ trait InventoryMessage extends DataPayload {
/** One or more inventory entries up to a maximum of 50,000 entries.
*/
def inventories: Seq[Inventory]
def inventories: Vector[Inventory]
override def commandName = NetworkPayload.invCommandName
@ -379,7 +379,7 @@ object InventoryMessage extends Factory[InventoryMessage] {
private case class InventoryMessageImpl(
inventoryCount: CompactSizeUInt,
inventories: Seq[Inventory])
inventories: Vector[Inventory])
extends InventoryMessage
override def fromBytes(bytes: ByteVector): InventoryMessage =
@ -387,11 +387,11 @@ object InventoryMessage extends Factory[InventoryMessage] {
def apply(
inventoryCount: CompactSizeUInt,
inventories: Seq[Inventory]): InventoryMessage = {
inventories: Vector[Inventory]): InventoryMessage = {
InventoryMessageImpl(inventoryCount, inventories)
}
def apply(inventories: Seq[Inventory]): InventoryMessage = {
def apply(inventories: Vector[Inventory]): InventoryMessage = {
val count = CompactSizeUInt(UInt64(inventories.length))
InventoryMessage(count, inventories)
}
@ -466,20 +466,20 @@ object NotFoundMessage extends Factory[NotFoundMessage] {
private case class NotFoundMessageImpl(
inventoryCount: CompactSizeUInt,
inventories: Seq[Inventory])
inventories: Vector[Inventory])
extends NotFoundMessage
def fromBytes(bytes: ByteVector): NotFoundMessage =
RawNotFoundMessageSerializer.read(bytes)
def apply(inventories: Seq[Inventory]): NotFoundMessage = {
def apply(inventories: Vector[Inventory]): NotFoundMessage = {
val count = CompactSizeUInt(UInt64(inventories.length))
apply(count, inventories)
}
def apply(
inventoryCount: CompactSizeUInt,
inventories: Seq[Inventory]): NotFoundMessage = {
inventories: Vector[Inventory]): NotFoundMessage = {
NotFoundMessageImpl(inventoryCount, inventories)
}
}

2
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawGetBlocksMessageSerializer.scala
View File

@ -25,7 +25,7 @@ trait RawGetBlocksMessageSerializer
val (blockHashHeaders, remainingBytes) =
parseBlockHeaders(blockHeaderBytesStopHash, hashCount)
val stopHash = DoubleSha256Digest(remainingBytes.slice(0, 32))
GetBlocksMessage(version, hashCount, blockHashHeaders, stopHash)
GetBlocksMessage(version, hashCount, blockHashHeaders.toVector, stopHash)
}
def write(getBlocksMessage: GetBlocksMessage): ByteVector = {

2
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawGetHeadersMessageSerializer.scala
View File

@ -19,7 +19,7 @@ trait RawGetHeadersMessageSerializer
val (hashes, remainingBytes) =
parseHashes(bytes.drop(hashesStartIndex), hashCount)
val hashStop = DoubleSha256Digest(remainingBytes.take(32))
GetHeadersMessage(version, hashCount, hashes, hashStop)
GetHeadersMessage(version, hashCount, hashes.toVector, hashStop)
}
override def write(getHeadersMessage: GetHeadersMessage): ByteVector = {

2
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawInventoryMessageSerializer.scala
View File

@ -21,7 +21,7 @@ trait RawInventoryMessageSerializer
val inventoryStart = inventoryCount.byteSize.toInt
val remainingBytes = bytes.slice(inventoryStart, bytes.size)
val (inventories, _) = parseInventories(remainingBytes, inventoryCount)
InventoryMessage(inventoryCount, inventories)
InventoryMessage(inventoryCount, inventories.toVector)
}
/** Tranforms an inventory object into a hexadecimal string

2
node/src/main/scala/org/bitcoins/node/networking/peer/DataMessageHandler.scala
View File

@ -566,7 +566,7 @@ case class DataMessageHandler(
}
for {
getData <- invsOptF.map(_.flatten).map(GetDataMessage(_))
getData <- invsOptF.map(_.flatten).map(i => GetDataMessage(i.toVector))
_ <- peerMessageSenderApi.sendMsg(getData)
} yield this
}

10
testkit-core/src/main/scala/org/bitcoins/testkitcore/gen/p2p/DataMessageGenerator.scala
View File

@ -45,7 +45,7 @@ trait DataMessageGenerator {
.nonEmptyListOf(CryptoGenerators.doubleSha256Digest)
.suchThat(_.length <= 500)
stopHash <- CryptoGenerators.doubleSha256Digest
} yield GetBlocksMessage(protocol, hashes, stopHash)
} yield GetBlocksMessage(protocol, hashes.toVector, stopHash)
}
/** Generates a random [[org.bitcoins.core.p2p.GetHeadersMessage]]
@ -59,7 +59,7 @@ trait DataMessageGenerator {
numHashes <- Gen.choose(0, 2000)
hashes <- CryptoGenerators.doubleSha256DigestSeq(numHashes)
hashStop <- CryptoGenerators.doubleSha256Digest
} yield GetHeadersMessage(version, hashes, hashStop)
} yield GetHeadersMessage(version, hashes.toVector, hashStop)
/** Generates a `getheaders` message with the default protocol version */
def getHeaderDefaultProtocolMessage: Gen[GetHeadersMessage] = {
@ -67,7 +67,7 @@ trait DataMessageGenerator {
numHashes <- Gen.choose(0, 2000)
hashes <- CryptoGenerators.doubleSha256DigestSeq(numHashes)
hashStop <- CryptoGenerators.doubleSha256Digest
} yield GetHeadersMessage(hashes, hashStop)
} yield GetHeadersMessage(hashes.toVector, hashStop)
}
def headersMessage: Gen[HeadersMessage] =
@ -108,12 +108,12 @@ trait DataMessageGenerator {
for {
numInventories <- Gen.choose(0, 500)
inventories <- Gen.listOfN(numInventories, inventory)
} yield InventoryMessage(inventories)
} yield InventoryMessage(inventories.toVector)
def notFoundMessage: Gen[NotFoundMessage] = {
for {
inventories <- Gen.nonEmptyListOf(inventory)
} yield NotFoundMessage(inventories)
} yield NotFoundMessage(inventories.toVector)
}
/** Generate a random [[org.bitcoins.core.p2p.GetDataMessage]]