diff options
Diffstat (limited to 'tests/trawblock.nim')
-rw-r--r-- | tests/trawblock.nim | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/trawblock.nim b/tests/trawblock.nim index 1e92c60..e789b4b 100644 --- a/tests/trawblock.nim +++ b/tests/trawblock.nim | |||
@@ -15,7 +15,7 @@ | |||
15 | # along with this program. If not, see <https://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | import unittest, streams | 17 | import unittest, streams |
18 | import bitstream, rawblock | 18 | import bitreader, bitwriter, rawblock |
19 | 19 | ||
20 | suite "rawblock": | 20 | suite "rawblock": |
21 | test "serialise": | 21 | test "serialise": |
@@ -23,14 +23,14 @@ suite "rawblock": | |||
23 | defer: rawStream.close() | 23 | defer: rawStream.close() |
24 | rawStream.write(0xFEDC_BA98_7654_3210'u64) | 24 | rawStream.write(0xFEDC_BA98_7654_3210'u64) |
25 | rawStream.setPosition(0) | 25 | rawStream.setPosition(0) |
26 | let rawBitStream = rawStream.bitStream() | 26 | let rawBitReader = rawStream.bitReader() |
27 | let rawBlock = rawblock.readRaw(rawBitStream) | 27 | let rawBlock = rawblock.readRaw(rawBitReader) |
28 | 28 | ||
29 | let outputStream = newStringStream() | 29 | let outputStream = newStringStream() |
30 | defer: outputStream.close() | 30 | defer: outputStream.close() |
31 | let outputBitStream = outputStream.bitStream() | 31 | let outputBitWriter = outputStream.bitWriter() |
32 | rawBlock.writeSerialisedTo(outputBitStream) | 32 | rawBlock.writeSerialisedTo(outputBitWriter) |
33 | outputBitStream.flush() | 33 | outputBitWriter.flush() |
34 | 34 | ||
35 | outputStream.setPosition(0) | 35 | outputStream.setPosition(0) |
36 | check outputStream.readUint16() == 64 | 36 | check outputStream.readUint16() == 64 |
@@ -43,14 +43,14 @@ suite "rawblock": | |||
43 | serialisedStream.write(60'u16) | 43 | serialisedStream.write(60'u16) |
44 | serialisedStream.write(0xFEDC_BA98_7654_3210'u64) | 44 | serialisedStream.write(0xFEDC_BA98_7654_3210'u64) |
45 | serialisedStream.setPosition(0) | 45 | serialisedStream.setPosition(0) |
46 | let serialisedBitStream = serialisedStream.bitStream() | 46 | let serialisedBitReader = serialisedStream.bitReader() |
47 | let rawBlock = rawBlock.readSerialised(serialisedBitStream) | 47 | let rawBlock = rawBlock.readSerialised(serialisedBitReader) |
48 | 48 | ||
49 | let outputStream = newStringStream() | 49 | let outputStream = newStringStream() |
50 | defer: outputStream.close() | 50 | defer: outputStream.close() |
51 | let outputBitStream = outputStream.bitStream() | 51 | let outputBitWriter = outputStream.bitWriter() |
52 | rawBlock.writeRawTo(outputBitStream) | 52 | rawBlock.writeRawTo(outputBitWriter) |
53 | outputBitStream.flush() | 53 | outputBitWriter.flush() |
54 | 54 | ||
55 | outputStream.setPosition(0) | 55 | outputStream.setPosition(0) |
56 | check outputStream.readUint64 == 0x0EDC_BA98_7654_3210'u64 | 56 | check outputStream.readUint64 == 0x0EDC_BA98_7654_3210'u64 |