Page MenuHomePhabricator
Files F13711215

D12653.diff
No OneTemporary
Actions

D12653.diff
View Options

diff --git a/web/cashtab/src/hooks/useBCH.js b/web/cashtab/src/hooks/useBCH.js
--- a/web/cashtab/src/hooks/useBCH.js
+++ b/web/cashtab/src/hooks/useBCH.js
@@ -62,7 +62,6 @@
txBuilder = tokenTxInputObj.txBuilder;
let tokenTxOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'GENESIS',
CREATION_ADDR,
@@ -159,7 +158,6 @@
txBuilder = tokenTxInputObj.txBuilder;
let tokenTxOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'SEND',
CREATION_ADDR,
@@ -240,7 +238,6 @@
txBuilder = tokenTxInputObj.txBuilder;
let tokenTxOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'BURN',
CREATION_ADDR,
diff --git a/web/cashtab/src/utils/__tests__/cashMethods.test.js b/web/cashtab/src/utils/__tests__/cashMethods.test.js
--- a/web/cashtab/src/utils/__tests__/cashMethods.test.js
+++ b/web/cashtab/src/utils/__tests__/cashMethods.test.js
@@ -700,13 +700,11 @@
});
it(`generateTokenTxOutput() returns a valid object for a valid create token tx`, async () => {
- const BCH = new BCHJS();
let txBuilder = new TransactionBuilder();
const { configObj, wallet } = createTokenMock;
const tokenSenderCashAddress = wallet.Path1899.cashAddress;
const tokenOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'GENESIS',
tokenSenderCashAddress,
@@ -721,14 +719,12 @@
});
it(`generateTokenTxOutput() returns a valid object for a valid send token tx`, async () => {
- const BCH = new BCHJS();
let txBuilder = new TransactionBuilder();
const { wallet } = createTokenMock;
const tokenSenderCashAddress = wallet.Path1899.cashAddress;
const tokenRecipientTokenAddress = wallet.Path1899.slpAddress;
const tokenOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'SEND',
tokenSenderCashAddress,
@@ -745,13 +741,11 @@
});
it(`generateTokenTxOutput() returns a valid object for a valid burn token tx`, async () => {
- const BCH = new BCHJS();
let txBuilder = new TransactionBuilder();
const { wallet } = createTokenMock;
const tokenSenderCashAddress = wallet.Path1899.cashAddress;
const tokenOutputObj = generateTokenTxOutput(
- BCH,
txBuilder,
'BURN',
tokenSenderCashAddress,
diff --git a/web/cashtab/src/utils/cashMethods.js b/web/cashtab/src/utils/cashMethods.js
--- a/web/cashtab/src/utils/cashMethods.js
+++ b/web/cashtab/src/utils/cashMethods.js
@@ -215,7 +215,6 @@
};
export const generateTokenTxOutput = (
- BCH,
txBuilder,
tokenAction,
legacyCashOriginAddress,
@@ -226,7 +225,7 @@
tokenAmount = false, // optional - send or burn amount for send/burn tx only
) => {
try {
- if (!BCH || !tokenAction || !legacyCashOriginAddress || !txBuilder) {
+ if (!tokenAction || !legacyCashOriginAddress || !txBuilder) {
throw new Error('Invalid token tx output parameter');
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:59 (10 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573344
Default Alt Text
D12653.diff (3 KB)

Event Timeline