Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions __tests__/__fixtures__/http-fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,7 @@ export default {
name: 'Test 1',
symbol: 'TST1',
success: true,
version: 1, // TokenVersion.DEPOSIT - required for mint/melt operations
mint: [
{
tx_id: '007c9d497135e10dcba984f0b893804d7cb06721c800064cfbe05fafc138faca',
Expand Down
20 changes: 8 additions & 12 deletions __tests__/integration/multisig.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -528,15 +528,14 @@ describe('send tx (HTR)', () => {
type: 'Transaction',
version: 1,
tokens: [txCreateToken.hash],
inputs: [
inputs: expect.arrayContaining([
expect.objectContaining({
decoded: {
type: 'MultiSig',
address: expect.any(String),
timelock: null,
},
txId: expect.any(String),
index: 0,
token: '00',
value: expect.any(Number),
tokenData: 0,
Expand All @@ -552,7 +551,6 @@ describe('send tx (HTR)', () => {
timelock: null,
},
txId: expect.any(String),
index: 2,
token: tokenUid,
value: 1,
tokenData: 129,
Expand All @@ -561,7 +559,7 @@ describe('send tx (HTR)', () => {
signed: false,
mine: true,
}),
],
]),
outputs: expect.arrayContaining([
{
decoded: {
Expand Down Expand Up @@ -637,14 +635,13 @@ describe('send tx (HTR)', () => {
txCreateToken.hash,
],
completeSignatures: false,
inputs: [
{
inputs: expect.arrayContaining([
expect.objectContaining({
decoded: {
address: expect.any(String),
timelock: null,
type: 'MultiSig',
},
index: 3,
mine: true,
script: expect.any(String),
signed: false,
Expand All @@ -653,14 +650,13 @@ describe('send tx (HTR)', () => {
token_data: 129,
txId: expect.any(String),
value: 2,
},
{
}),
expect.objectContaining({
decoded: {
address: expect.any(String),
timelock: null,
type: 'MultiSig',
},
index: 1,
mine: true,
script: expect.any(String),
signed: false,
Expand All @@ -669,8 +665,8 @@ describe('send tx (HTR)', () => {
token_data: 1,
txId: expect.any(String),
value: 100,
},
],
}),
]),
outputs: [
{
decoded: {
Expand Down
6 changes: 3 additions & 3 deletions __tests__/mark_utxos_selected_as_input.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('mark utxos selected_as_input api', () => {
expect(selectSpy).toHaveBeenCalledWith(
{ index: 0, txId: '5db0a8c77f818c51cb107532fc1a36785adfa700d81d973fd1f23438b2f3dd74' },
true,
null,
undefined,
);
});

Expand Down Expand Up @@ -141,7 +141,7 @@ describe('mark utxos selected_as_input api', () => {
expect(selectSpy).toHaveBeenCalledWith(
{ index: 0, txId: '5db0a8c77f818c51cb107532fc1a36785adfa700d81d973fd1f23438b2f3dd74' },
false,
null,
undefined,
);
});

Expand All @@ -157,7 +157,7 @@ describe('mark utxos selected_as_input api', () => {
expect(selectSpy).toHaveBeenCalledWith(
{ index: 0, txId: '5db0a8c77f818c51cb107532fc1a36785adfa700d81d973fd1f23438b2f3dd74' },
true,
null,
undefined,
);
});

Expand Down
2 changes: 1 addition & 1 deletion __tests__/p2sh/tx-proposal-mint-tokens.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe('mint-tokens tx-proposal api', () => {
})
.set({ 'x-wallet-id': walletId });
expect(response.status).toBe(200);
expect(response.body.error).toContain('Not enough HTR tokens for deposit: 10000000000 required');
expect(response.body.error).toContain('Not enough HTR tokens for deposit or fee: 10000000000 required');
});

it('should return 200 with a valid body selecting address', async () => {
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@dinamonetworks/hsm-dinamo": "4.9.1",
"@hathor/healthcheck-lib": "0.1.0",
"@hathor/wallet-lib": "2.9.0",
"@hathor/wallet-lib": "2.14.0",
"axios": "1.7.7",
"express": "4.18.2",
"express-validator": "6.10.0",
Expand Down