Merge pull request #5440

ebdd6bf Remove genesis block hash from error (Micha)
8d174d6 Make several small string fixes in linearize-data.py (Micha)
This commit is contained in:
Wladimir J. van der Laan 2014-12-11 16:33:20 +01:00
commit 3bb29a3e13
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -148,7 +148,7 @@ class BlockDataCopier:
outFname = self.settings['output_file']
else:
outFname = "%s/blk%05d.dat" % (self.settings['output'], outFn)
print("Output file" + outFname)
print("Output file " + outFname)
self.outF = open(outFname, "wb")
self.outF.write(inhdr)
@ -189,7 +189,7 @@ class BlockDataCopier:
while self.blkCountOut < len(self.blkindex):
if not self.inF:
fname = self.inFileName(self.inFn)
print("Input file" + fname)
print("Input file " + fname)
try:
self.inF = open(fname, "rb")
except IOError:
@ -205,7 +205,7 @@ class BlockDataCopier:
inMagic = inhdr[:4]
if (inMagic != self.settings['netmagic']):
print("Invalid magic:" + inMagic)
print("Invalid magic: " + inMagic)
return
inLenLE = inhdr[4:]
su = struct.unpack("<I", inLenLE)
@ -292,7 +292,7 @@ if __name__ == '__main__':
blkmap = mkblockmap(blkindex)
if not "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" in blkmap:
print("not found")
print("Genesis block not found in hashlist")
else:
BlockDataCopier(settings, blkindex, blkmap).run()