tiamak/node-cryptoforknote-util-mo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed blob_type usage

Browse Source
This commit is contained in:
MoneroOcean
2018-03-25 14:31:17 +02:00
parent 8eae3d40fb
commit c60a7b145e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptonote_core/cryptonote_basic.h
View File

@@ -471,7 +471,7 @@ namespace cryptonote
struct block_header
{
//enum BLOB_TYPE blob_type;
enum BLOB_TYPE blob_type;
uint8_t major_version;
uint8_t minor_version;
@@ -482,9 +482,9 @@ namespace cryptonote
BEGIN_SERIALIZE()
VARINT_FIELD(major_version)
VARINT_FIELD(minor_version)
if (BLOB_TYPE_CRYPTONOTE != BLOB_TYPE_FORKNOTE2) VARINT_FIELD(timestamp)
if (blob_type != BLOB_TYPE_FORKNOTE2) VARINT_FIELD(timestamp)
FIELD(prev_id)
if (BLOB_TYPE_CRYPTONOTE != BLOB_TYPE_FORKNOTE2) FIELD(nonce)
if (blob_type != BLOB_TYPE_FORKNOTE2) FIELD(nonce)
END_SERIALIZE()
};
@@ -497,7 +497,7 @@ namespace cryptonote
BEGIN_SERIALIZE_OBJECT()
FIELDS(*static_cast<block_header *>(this))
if (BLOB_TYPE_CRYPTONOTE == BLOB_TYPE_FORKNOTE2)
if (blob_type == BLOB_TYPE_FORKNOTE2)
{
auto sbb = make_serializable_bytecoin_block(*this, false, false);
FIELD_N("parent_block", sbb);