Merge pull request #72 from Permissionless-Software-Foundation/ct-unstable

fix(debugging): Debugging problem with hydrateUtxos()
This commit is contained in:
Chris Troutner
2020-12-13 06:55:48 -08:00
committed by GitHub
3 changed files with 22 additions and 82 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
"test:integration:local": "RESTURL=http://localhost:3000/v4/ mocha --timeout 30000 test/integration",
"test:integration:local:bchn": "RESTURL=http://localhost:3000/v4/ bash test/integration/test-bchn-integration.sh",
"test:integration:local:testnet": "RESTURL=http://localhost:4000/v4/ mocha --timeout 30000 test/integration/testnet",
"test:temp": "export RESTURL=http://localhost:3000/v4/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/chains/bchn/",
"test:temp": "export RESTURL=http://localhost:3000/v4/ && mocha --timeout 30000 -g '#hydrateUtxos' test/integration/",
"coverage": "nyc report --reporter=text-lcov | coveralls",
"coverage:report": "nyc --reporter=html mocha --timeout 25000 test/unit/",
"docs": "./node_modules/.bin/apidoc -i src/ -o docs"
+2
View File
@@ -1293,7 +1293,9 @@ class Utils {
// If not in the cache, try the general SLPDB.
if (isValid == null) {
console.log(`utxo: ${JSON.stringify(utxo, null, 2)}`)
isValid = await this.validateTxid(utxo.txid)
console.log(`isValid: ${JSON.stringify(isValid, null, 2)}`)
if (isValid !== null) {
isValid = isValid[0].valid
+19 -81
View File
@@ -464,96 +464,19 @@ describe(`#SLP`, () => {
assert.equal(data[0].isValid, false)
})
// it("should handle a range of UTXO types", async () => {
// it("should handle null SLPDB validations", async () => {
// const utxos = [
// // Malformed SLP tx
// {
// note: "Malformed SLP tx",
// height: 665577,
// tx_hash:
// "f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a",
// tx_pos: 1,
// value: 546
// },
// // Normal TX (non-SLP)
// {
// note: "Normal TX (non-SLP)",
// tx_hash:
// "01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0",
// tx_pos: 0,
// value: 400000
// },
// // Valid PSF SLP tx
// {
// note: "Valid PSF SLP tx",
// tx_hash:
// "daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd",
// tx_pos: 1,
// value: 546
// },
// // Valid SLP token not in whitelist
// {
// note: "Valid SLP token not in whitelist",
// tx_hash:
// "3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488",
// tx_pos: 1,
// value: 546
// },
// // Token send on BCHN network.
// {
// note: "Token send on BCHN network",
// tx_hash:
// "402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019",
// tx_pos: 1,
// value: 546
// },
// // Token send on ABC network.
// {
// note: "Token send on ABC network",
// tx_hash:
// "336bfe2168aac4c3303508a9e8548a0d33797a83b85b76a12d845c8d6674f79d",
// tx_pos: 1,
// value: 546
// },
// // Known invalid SLP token send of PSF tokens.
// {
// note: "Known invalid SLP token send of PSF tokens",
// tx_hash:
// "2bf691ad3679d928fef880b8a45b93b233f8fa0d0a92cf792313dbe77b1deb74",
// "4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419",
// tx_pos: 1,
// value: 546
// }
// ]
//
// const data = await bchjs.SLP.Utils.tokenUtxoDetails(utxos)
// // console.log(`data: ${JSON.stringify(data, null, 2)}`)
//
// // Malformed SLP tx
// assert.equal(data[0].tx_hash, utxos[0].tx_hash)
// assert.equal(data[0].isValid, false)
//
// // Normal TX (non-SLP)
// assert.equal(data[1].tx_hash, utxos[1].tx_hash)
// assert.equal(data[1].isValid, false)
//
// // Valid PSF SLP tx
// assert.equal(data[2].tx_hash, utxos[2].tx_hash)
// assert.equal(data[2].isValid, true)
//
// // Valid SLP token not in whitelist
// assert.equal(data[3].tx_hash, utxos[3].tx_hash)
// assert.equal(data[3].isValid, true)
//
// // Token send on BCHN network
// assert.equal(data[4].tx_hash, utxos[4].tx_hash)
// assert.equal(data[4].isValid, null)
//
// // Token send on ABC network
// assert.equal(data[5].tx_hash, utxos[5].tx_hash)
// assert.equal(data[5].isValid, true)
//
// // Known invalid SLP token send of PSF tokens
// assert.equal(data[6].tx_hash, utxos[6].tx_hash)
// assert.equal(data[6].isValid, false)
// console.log(`data: ${JSON.stringify(data, null, 2)}`)
// })
})
@@ -695,6 +618,21 @@ describe(`#SLP`, () => {
console.log("Error: ", err)
}
})
// it("should handle null SLPDB validations", async () => {
// const utxos = [
// {
// height: 665577,
// tx_hash:
// "4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419",
// tx_pos: 1,
// value: 546
// }
// ]
//
// const data = await bchjs.SLP.Utils.hydrateUtxos([{ utxos: utxos }])
// console.log(`data: ${JSON.stringify(data, null, 2)}`)
// })
})
describe("#validateTxid2", () => {