status-im
/
nim-eth-p2p
mirror of https://github.com/status-im/nim-eth-p2p.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22 from data-man/fix_hexdump 

Remove unused hexdump module
This commit is contained in:
Yuriy Glukhov 2018-05-17 16:35:30 +03:00 committed by GitHub
parent 84ac86cc94 b6b511c1ad
commit 6e6262b318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethp2p.nim
View File

@ -8,5 +8,5 @@
# MIT license (LICENSE-MIT)
#
import ethp2p/[ecies, auth, hexdump, enode, rlpxcrypt, discovery, kademlia]
export ecies, auth, enode, hexdump, rlpxcrypt, discovery, kademlia
import ethp2p/[ecies, auth, enode, rlpxcrypt, discovery, kademlia]
export ecies, auth, enode, rlpxcrypt, discovery, kademlia

92
ethp2p/hexdump.nim
View File

@ -1,92 +0,0 @@
#
# Copyright (c) 2016 Eugene Kabanov <ka@hardcore.kiev.ua>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
from strutils import toHex, repeat
proc dumpHex*(pbytes: pointer, nbytes: int, items = 1, ascii = true): string =
## Return hexadecimal memory dump representation pointed by ``p``.
## ``nbytes`` - number of bytes to show
## ``items`` - number of bytes in group (supported ``items`` count is
## 1, 2, 4, 8)
## ``ascii`` - if ``true`` show ASCII representation of memory dump.
result = ""
let hexSize = items * 2
var i = 0
var slider = pbytes
var asciiText = ""
while i < nbytes:
if i %% 16 == 0:
result = result & toHex(cast[BiggestInt](slider),
sizeof(BiggestInt) * 2) & ": "
var k = 0
while k < items:
var ch = cast[ptr char](cast[uint](slider) + k.uint)[]
if ord(ch) > 31 and ord(ch) < 127: asciiText &= ch else: asciiText &= "."
inc(k)
case items:
of 1:
result = result & toHex(cast[BiggestInt](cast[ptr uint8](slider)[]),
hexSize)
of 2:
result = result & toHex(cast[BiggestInt](cast[ptr uint16](slider)[]),
hexSize)
of 4:
result = result & toHex(cast[BiggestInt](cast[ptr uint32](slider)[]),
hexSize)
of 8:
result = result & toHex(cast[BiggestInt](cast[ptr uint64](slider)[]),
hexSize)
else:
raise newException(ValueError, "Wrong items size!")
result = result & " "
slider = cast[pointer](cast[uint](slider) + items.uint)
i = i + items
if i %% 16 == 0:
result = result & " " & asciiText
asciiText.setLen(0)
result = result & "\n"
if i %% 16 != 0:
var spacesCount = ((16 - (i %% 16)) div items) * (hexSize + 1) + 1
result = result & repeat(' ', spacesCount)
result = result & asciiText
result = result & "\n"
proc dumpHex*[T](v: openarray[T], items: int = 0, ascii = true): string =
## Return hexadecimal memory dump representation of openarray[T] ``v``.
## ``items`` - number of bytes in group (supported ``items`` count is
## 0, 1, 2, 4, 8). If ``items`` is ``0`` group size will depend on
## ``sizeof(T)``.
## ``ascii`` - if ``true`` show ASCII representation of memory dump.
var i = 0
if items == 0:
when sizeof(T) == 2:
i = 2
elif sizeof(T) == 4:
i = 4
elif sizeof(T) == 8:
i = 8
else:
i = 1
else:
i = items
result = dumpHex(unsafeAddr v[0], sizeof(T) * len(v), i, ascii)

3
tests/testauth.nim
View File

@ -8,8 +8,7 @@
#
import unittest
import eth_keys, ethp2p/auth, nimcrypto/utils, nimcrypto/keccak,
ethp2p/hexdump
import eth_keys, ethp2p/auth, nimcrypto/utils, nimcrypto/keccak
# This was generated by `print` actual auth message generated by
# https://github.com/ethereum/py-evm/blob/master/tests/p2p/test_auth.py

2
tests/testcrypt.nim
View File

@ -8,7 +8,7 @@
#
import unittest
import eth_keys, ethp2p/auth, ethp2p/rlpxcrypt, nimcrypto/utils, ethp2p/hexdump
import eth_keys, ethp2p/auth, ethp2p/rlpxcrypt, nimcrypto/utils
import nimcrypto/sysrand, nimcrypto/keccak
const data = [