Skip to content
This repository has been archived by the owner on Jun 7, 2019. It is now read-only.

Commit

Permalink
🏠 Fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
shuse2 committed Feb 16, 2018
1 parent cf0a1dc commit fee66fb
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 5 deletions.
26 changes: 26 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/transactions/utils/getTransactionBytes.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const getAssetDataForRegisterSecondSignatureTransaction = ({
}) => {
checkRequiredFields(['publicKey'], signature);
const { publicKey } = signature;
return cryptoModule.hexToBuffer(publicKey);
return cryptography.hexToBuffer(publicKey);
};

export const getAssetDataForRegisterDelegateTransaction = ({ delegate }) => {
Expand Down Expand Up @@ -159,12 +159,12 @@ const getTransactionBytes = transaction => {
BYTESIZES.TIMESTAMP,
);

const transactionSenderPublicKey = cryptoModule.hexToBuffer(
const transactionSenderPublicKey = cryptography.hexToBuffer(
transaction.senderPublicKey,
);

const transactionRequesterPublicKey = transaction.requesterPublicKey
? cryptoModule.hexToBuffer(transaction.requesterPublicKey)
? cryptography.hexToBuffer(transaction.requesterPublicKey)
: Buffer.alloc(0);

const transactionRecipientID = transaction.recipientId
Expand All @@ -182,11 +182,11 @@ const getTransactionBytes = transaction => {
const transactionAssetData = getAssetBytes(transaction);

const transactionSignature = transaction.signature
? cryptoModule.hexToBuffer(transaction.signature)
? cryptography.hexToBuffer(transaction.signature)
: Buffer.alloc(0);

const transactionSecondSignature = transaction.signSignature
? cryptoModule.hexToBuffer(transaction.signSignature)
? cryptography.hexToBuffer(transaction.signSignature)
: Buffer.alloc(0);

return Buffer.concat([
Expand Down

0 comments on commit fee66fb

Please sign in to comment.