Merge branch 'master' of github.com:decentraland/builder-server into …

…fix/tp-manager-check

migrations/1646234502768_add-cheque-signature-column.ts

@@ -0,0 +1,26 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { MigrationBuilder, ColumnDefinitions } from 'node-pg-migrate'
+import { SlotUsageCheque } from '../src/SlotUsageCheque'
+
+const tableName = SlotUsageCheque.tableName
+const oldColumnName = 'signedMessage'
+
+const columns = {
+  signature: { type: 'TEXT', notNull: true },
+  salt: { type: 'VARCHAR(66)', notNull: true },
+  qty: { type: 'INT', notNull: true },
+}
+
+export const shorthands: ColumnDefinitions | undefined = undefined
+
+export async function up(pgm: MigrationBuilder): Promise<void> {
+  pgm.dropColumn(tableName, oldColumnName)
+  pgm.addColumn(tableName, columns)
+}
+
+export async function down(pgm: MigrationBuilder): Promise<void> {
+  pgm.dropColumn(tableName, columns)
+  pgm.addColumn(tableName, {
+    [oldColumnName]: { type: 'TEXT', notNull: true },
+  })
+}

spec/utils.ts

@@ -105,8 +105,8 @@ export function mockAuthorizationMiddleware(
 
 /**
  * Mocks the "withModelAuthorization" middleware used in the collection's middleware
- * by mocking all the function calls to the Collection model and the TPW requests.
- * This mock requires the Collection model and the TPW API "isManager" method to be mocked first.
+ * by mocking all the function calls to the Collection model and the TP requests.
+ * This mock requires the Collection model and the TP API "isManager" method to be mocked first.
  *
  * @param id - The id of the collection to be authorized.
  * @param ethAddress - The ethAddress of the user that will be requesting authorization to the collection.
@@ -218,7 +218,7 @@ export function mockThirdPartyURNExists(
 
 /**
  * Mocks the "withModelAuthorization" middleware used in the items's middleware
- * by mocking all the function calls to the Collection model and the TPW requests.
+ * by mocking all the function calls to the Collection model and the TP requests.
  * This mock requires the Item model findOne method to be mocked first.
  *
  * @param id - The id of the item to be authorized.