Cleanups.

This commit is contained in:
JoelKatz
2012-04-24 18:18:44 -07:00
parent 275d509d31
commit 8eaff48c19
3 changed files with 9 additions and 8 deletions

View File

@@ -20,7 +20,7 @@ public:
typedef boost::shared_ptr<Transaction> pointer; typedef boost::shared_ptr<Transaction> pointer;
private: private:
uint256 mTransactionID; uint256 mID;
uint160 mHanko; uint160 mHanko;
uint64 mTimestamp; uint64 mTimestamp;
ConfirmationStatus mStatus; ConfirmationStatus mStatus;
@@ -28,11 +28,11 @@ private:
std::vector<unsigned char> mSignature; std::vector<unsigned char> mSignature;
public: public:
Transaction(); Confirmation();
Transaction(const uint256 &id); Confirmation(const uint256 &id);
Transaction(const std::vector<unsigned char> rawTransaction); Confirmation(const std::vector<unsigned char> rawConfirmation);
const uint256& GetID() const { return mTransactionID; } const uint256& GetID() const { return mID; }
const uint160& GetHanko() const { return mHanko; } const uint160& GetHanko() const { return mHanko; }
uint64 GetTimestamp() const { return mTimestamp; } uint64 GetTimestamp() const { return mTimestamp; }
ConfirmationStatus() const { return mStatus; } ConfirmationStatus() const { return mStatus; }

View File

@@ -83,7 +83,7 @@ void CKey::getECIESSecret(CKey& otherKey, ECIES_ENC_KEY_TYPE& enc_key, ECIES_HMA
memset(hbuf, 0, ECIES_KEY_LENGTH); memset(hbuf, 0, ECIES_KEY_LENGTH);
} }
static ECIES_HMAC_TYPE makeHMAC(const ECIES_HMAC_KEY_TYPE& secret, const std::vector<unsigned char> data) static ECIES_HMAC_TYPE makeHMAC(const ECIES_HMAC_KEY_TYPE& secret, const std::vector<unsigned char>& data)
{ {
HMAC_CTX ctx; HMAC_CTX ctx;
HMAC_CTX_init(&ctx); HMAC_CTX_init(&ctx);

View File

@@ -53,7 +53,8 @@ Transaction::Transaction(LocalAccount::pointer fromLocalAccount, const NewcoinAd
} }
} }
Transaction::Transaction(SerializedTransaction::pointer sit, bool validate) : mStatus(INVALID), mTransaction(sit) Transaction::Transaction(SerializedTransaction::pointer sit, bool validate)
: mInLedger(0), mStatus(INVALID), mTransaction(sit)
{ {
std::vector<unsigned char> pubKey; std::vector<unsigned char> pubKey;
@@ -76,7 +77,7 @@ Transaction::Transaction(SerializedTransaction::pointer sit, bool validate) : mS
mStatus = NEW; mStatus = NEW;
} }
Transaction::Transaction(const std::vector<unsigned char>& raw, bool validate) : mStatus(INVALID) Transaction::Transaction(const std::vector<unsigned char>& raw, bool validate) : mInLedger(0), mStatus(INVALID)
{ {
uint160 toAccountID; uint160 toAccountID;
uint160 fromAccountID; uint160 fromAccountID;