bitmessage/Jabit
bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

🔥 Remove duplicate code

Browse Source
This commit is contained in:
Christian Basler 2018-05-31 16:58:29 +02:00
parent 7b9694e660
commit fafabf64a3
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/kotlin/ch/dissem/bitmessage/entity/GetData.kt
View File

@ -17,9 +17,6 @@
package ch.dissem.bitmessage.entity
import ch.dissem.bitmessage.entity.valueobject.InventoryVector
import ch.dissem.bitmessage.utils.Encode
import java.io.OutputStream
import java.nio.ByteBuffer
/**
* The 'getdata' command is used to request objects from a node.
@ -31,24 +28,8 @@ class GetData constructor(var inventory: List<InventoryVector>) : MessagePayload
override fun writer(): StreamableWriter = Writer(this)
private class Writer(
private val item: GetData
) : StreamableWriter {
override fun write(out: OutputStream) {
Encode.varInt(item.inventory.size, out)
for (iv in item.inventory) {
iv.writer().write(out)
}
}
override fun write(buffer: ByteBuffer) {
Encode.varInt(item.inventory.size, buffer)
for (iv in item.inventory) {
iv.writer().write(buffer)
}
}
}
item: GetData
) : InventoryWriter(item.inventory)
companion object {
@JvmField

23
core/src/main/kotlin/ch/dissem/bitmessage/entity/Inv.kt
View File

@ -17,9 +17,6 @@
package ch.dissem.bitmessage.entity
import ch.dissem.bitmessage.entity.valueobject.InventoryVector
import ch.dissem.bitmessage.utils.Encode
import java.io.OutputStream
import java.nio.ByteBuffer
/**
* The 'inv' command holds up to 50000 inventory vectors, i.e. hashes of inventory items.
@ -31,22 +28,6 @@ class Inv constructor(val inventory: List<InventoryVector>) : MessagePayload {
override fun writer(): StreamableWriter = Writer(this)
private class Writer(
private val item: Inv
) : StreamableWriter {
override fun write(out: OutputStream) {
Encode.varInt(item.inventory.size, out)
for (iv in item.inventory) {
iv.writer().write(out)
}
}
override fun write(buffer: ByteBuffer) {
Encode.varInt(item.inventory.size, buffer)
for (iv in item.inventory) {
iv.writer().write(buffer)
}
}
}
item: Inv
) : InventoryWriter(item.inventory)
}

40
core/src/main/kotlin/ch/dissem/bitmessage/entity/InventoryWriter.kt Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright 2018 Christian Basler
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ch.dissem.bitmessage.entity
import ch.dissem.bitmessage.entity.valueobject.InventoryVector
import ch.dissem.bitmessage.utils.Encode
import java.io.OutputStream
import java.nio.ByteBuffer
internal open class InventoryWriter(private val inventory: List<InventoryVector>) : StreamableWriter {
override fun write(out: OutputStream) {
Encode.varInt(inventory.size, out)
for (iv in inventory) {
iv.writer().write(out)
}
}
override fun write(buffer: ByteBuffer) {
Encode.varInt(inventory.size, buffer)
for (iv in inventory) {
iv.writer().write(buffer)
}
}
}