@bsv/sdk 1.0.8 → 1.0.10

package/src/script/__tests/Script.test.ts

@@ -3,7 +3,6 @@ import PrivateKey from '../../../dist/cjs/src/primitives/PrivateKey'
 import P2PKH from '../../../dist/cjs/src/script/templates/P2PKH'
 import OP from '../../../dist/cjs/src/script/OP'
 import { toHex } from '../../../dist/cjs/src/primitives/utils'
-import scriptFromVector from './scriptFromVector'
 
 import scriptInvalid from './script.invalid.vectors'
 import scriptValid from './script.valid.vectors'
@@ -353,19 +352,19 @@ describe('Script', () => {
       }
       it(`should not fail when reading scriptValid vector ${i}`, () => {
         expect(() => {
-          scriptFromVector(a[0]).toHex()
-          scriptFromVector(a[0]).toASM()
+          Script.fromHex(a[0]).toHex()
+          Script.fromHex(a[0]).toASM()
         }).not.toThrow()
 
         expect(() => {
-          scriptFromVector(a[1]).toHex()
-          scriptFromVector(a[1]).toASM()
+          Script.fromHex(a[1]).toHex()
+          Script.fromHex(a[1]).toASM()
         }).not.toThrow()
 
         // should be able to return the same output over and over
-        let str = scriptFromVector(a[0]).toASM()
+        let str = Script.fromHex(a[0]).toASM()
         expect(Script.fromASM(str).toASM()).toEqual(str)
-        str = scriptFromVector(a[1]).toASM()
+        str = Script.fromHex(a[1]).toASM()
         expect(Script.fromASM(str).toASM()).toEqual(str)
       })
     })
@@ -376,26 +375,26 @@ describe('Script', () => {
       }
 
       it(`should not fail when reading scriptInvalid vector ${i}`, () => {
-      // Test that no errors are thrown for the first item
+        // Test that no errors are thrown for the first item
         expect(() => {
-          const scriptA = scriptFromVector(a[0])
+          const scriptA = Script.fromHex(a[0])
           scriptA.toHex()
           scriptA.toASM()
         }).not.toThrow()
 
         // Test that no errors are thrown for the second item
         expect(() => {
-          const scriptB = scriptFromVector(a[1])
+          const scriptB = Script.fromHex(a[1])
           scriptB.toHex()
           scriptB.toASM()
         }).not.toThrow()
 
         // Test that it should be able to return the same output over and over for the first item
-        const strA = scriptFromVector(a[0]).toASM()
+        const strA = Script.fromHex(a[0]).toASM()
         expect(Script.fromASM(strA).toASM()).toEqual(strA)
 
         // Test that it should be able to return the same output over and over for the second item
-        const strB = scriptFromVector(a[1]).toASM()
+        const strB = Script.fromHex(a[1]).toASM()
         expect(Script.fromASM(strB).toASM()).toEqual(strB)
       })
     })

package/src/script/__tests/Spend.test.ts

@@ -1,4 +1,3 @@
-import BigNumber from '../../../dist/cjs/src/primitives/BigNumber'
 import PrivateKey from '../../../dist/cjs/src/primitives/PrivateKey'
 import { hash160, hash256 } from '../../../dist/cjs/src/primitives/Hash'
 import Curve from '../../../dist/cjs/src/primitives/Curve'
@@ -6,7 +5,6 @@ import Spend from '../../../dist/cjs/src/script/Spend'
 import P2PKH from '../../../dist/cjs/src/script/templates/P2PKH'
 import RPuzzle from '../../../dist/cjs/src/script/templates/RPuzzle'
 import Transaction from '../../../dist/cjs/src/transaction/Transaction'
-import scriptFromVector from './scriptFromVector'
 import LockingScript from '../../../dist/cjs/src/script/LockingScript'
 import UnlockingScript from '../../../dist/cjs/src/script/UnlockingScript'
 
@@ -233,12 +231,12 @@ describe('Spend', () => {
         sourceTXID: '0000000000000000000000000000000000000000000000000000000000000000',
         sourceOutputIndex: 0,
         sourceSatoshis: 1,
-        lockingScript: new LockingScript(scriptFromVector(a[1]).chunks),
+        lockingScript: LockingScript.fromHex(a[1]),
         transactionVersion: 1,
         otherInputs: [],
         outputs: [],
         inputIndex: 0,
-        unlockingScript: new UnlockingScript(scriptFromVector(a[0]).chunks),
+        unlockingScript: UnlockingScript.fromHex(a[0]),
         inputSequence: 0xffffffff,
         lockTime: 0
       })