Update tbdex to latest main and move compiled-validators to cjs

TBD54566975 · Mar 26, 2024 · fceb7ac · fceb7ac
1 parent 80da7b6
commit fceb7ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/packages/http-server/tests/create-exchange.spec.ts b/packages/http-server/tests/create-exchange.spec.ts
@@ -273,7 +273,8 @@ describe('POST /exchanges/:exchangeId/rfq', () => {
                 },
                 required             : ['btcAddress'],
                 additionalProperties : false
-              }
+              },
+              estimatedSettlementTime: 10,
             }]
           },
         },

diff --git a/packages/protocol/build/compile-validators.js b/packages/protocol/build/compile-validators.js
@@ -49,4 +49,4 @@ const moduleCode = standaloneCode(validator)
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 await mkdirp(path.join(__dirname, '../generated'))
-fs.writeFileSync(path.join(__dirname, '../generated/compiled-validators.js'), moduleCode)
+fs.writeFileSync(path.join(__dirname, '../generated/compiled-validators.cjs'), moduleCode)
diff --git a/packages/protocol/src/validator.ts b/packages/protocol/src/validator.ts
@@ -1,6 +1,6 @@
 import type { ErrorObject } from 'ajv'
 // validator functions are compiled at build time. check ./build/compile-validators.js for more details
-import * as compiledValidators from '../generated/compiled-validators.js'
+import * as compiledValidators from '../generated/compiled-validators.cjs'
 
 /**
  * validates the payload against a json schema identified by name

diff --git a/packages/protocol/tests/test-vectors.spec.ts b/packages/protocol/tests/test-vectors.spec.ts
@@ -8,7 +8,7 @@ import ParseRfq from '../../../tbdex/hosted/test-vectors/protocol/vectors/parse-
 import { Close, Offering, Order, OrderStatus, Quote, Rfq } from '../src/main.js'
 import { Parser } from '../src/parser.js'
 
-describe.skip('TbdexTestVectorsProtocol', function () {
+describe('TbdexTestVectorsProtocol', function () {
   this.timeout(10000)
   it('parse_close', async () => {
     // Parse with parseMessage()
@@ -22,7 +22,7 @@ describe.skip('TbdexTestVectorsProtocol', function () {
     expect(close.toJSON()).to.deep.eq(ParseClose.output)
   })
 
-  it('parse_offering', async() => {
+  it.skip('parse_offering', async() => {
     // Parse with parseResource()
     const resource = await Parser.parseResource(ParseOffering.input)
     expect(resource.isOffering()).to.be.true
@@ -70,7 +70,7 @@ describe.skip('TbdexTestVectorsProtocol', function () {
     expect(quote.toJSON()).to.deep.eq(ParseQuote.output)
   })
 
-  it('parse_rfq', async () => {
+  it.skip('parse_rfq', async () => {
     // Parse with parseMessage()
     const message = await Parser.parseMessage(ParseRfq.input)
     expect(message.isRfq()).to.be.true

diff --git a/tbdex b/tbdex
-Original file line number
+Diff line change
@@ Expand Up / @@ -273,7 +273,8 @@ describe('POST /exchanges/:exchangeId/rfq', () => { @@
                     },
                     required             : ['btcAddress'],
                     additionalProperties : false
-                  }
+                  },
+                  estimatedSettlementTime: 10,
                 }]
               },
             },
@@ Expand Down @@
+1 −1		CODEOWNERS
+3 −0		hosted/json-schemas/close.schema.json
+1 −1		hosted/json-schemas/definitions.json
+10 −9		hosted/json-schemas/offering.schema.json
+7 −7		hosted/test-vectors/protocol/vectors/parse-close.json
+6 −6		hosted/test-vectors/protocol/vectors/parse-offering.json
+7 −7		hosted/test-vectors/protocol/vectors/parse-order.json
+7 −7		hosted/test-vectors/protocol/vectors/parse-orderstatus.json
+8 −8		hosted/test-vectors/protocol/vectors/parse-quote.json
+9 −9		hosted/test-vectors/protocol/vectors/parse-rfq.json
+61 −123		specs/http-api/README.md
+18 −18		specs/protocol/README.md