Skip to content

Commit b05df8e

Browse files
aitnitishshelageaitnitishshelage
authored
Merge pull request #54 from chuff/remove-multistate-version
Remove multistate version
2 parents e3260a1 + 7f802c6 commit b05df8e

File tree

9 files changed

+51
-54
lines changed

9 files changed

+51
-54
lines changed

‎modules/cmpapi/src/encoder/section/UsCaV1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1111
export class UsCaV1 extends AbstractEncodableSegmentedBitStringSection {
1212
public static readonly ID = 8;
1313
public static readonly VERSION = 1;
14-
public static readonly NAME = "uscav1";
14+
public static readonly NAME = "usca";
1515

1616
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1717

‎modules/cmpapi/src/encoder/section/UsCoV1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1111
export class UsCoV1 extends AbstractEncodableSegmentedBitStringSection {
1212
public static readonly ID = 10;
1313
public static readonly VERSION = 1;
14-
public static readonly NAME = "uscov1";
14+
public static readonly NAME = "usco";
1515

1616
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1717

‎modules/cmpapi/src/encoder/section/UsCtV1.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1111
export class UsCtV1 extends AbstractEncodableSegmentedBitStringSection {
1212
public static readonly ID = 12;
1313
public static readonly VERSION = 1;
14-
public static readonly NAME = "usctv1";
14+
public static readonly NAME = "usct";
1515

1616
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1717

@@ -29,10 +29,7 @@ export class UsCtV1 extends AbstractEncodableSegmentedBitStringSection {
2929
UsCtV1Field.SENSITIVE_DATA_PROCESSING.toString(),
3030
new EncodableFixedIntegerList(2, [0, 0, 0, 0, 0, 0, 0, 0])
3131
);
32-
fields.set(
33-
UsCtV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS.toString(),
34-
new EncodableFixedIntegerList(2, [0, 0, 0])
35-
);
32+
fields.set(UsCtV1Field.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS.toString(), new EncodableFixedIntegerList(2, [0, 0, 0]));
3633
fields.set(UsCtV1Field.MSPA_COVERED_TRANSACTION.toString(), new EncodableFixedInteger(2, 0));
3734
fields.set(UsCtV1Field.MSPA_OPT_OUT_OPTION_MODE.toString(), new EncodableFixedInteger(2, 0));
3835
fields.set(UsCtV1Field.MSPA_SERVICE_PROVIDER_MODE.toString(), new EncodableFixedInteger(2, 0));

‎modules/cmpapi/src/encoder/section/UsNatV1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1111
export class UsNatV1 extends AbstractEncodableSegmentedBitStringSection {
1212
public static readonly ID = 7;
1313
public static readonly VERSION = 1;
14-
public static readonly NAME = "usnatv1";
14+
public static readonly NAME = "usnat";
1515

1616
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1717

‎modules/cmpapi/src/encoder/section/UsUtV1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1010
export class UsUtV1 extends AbstractEncodableBitStringSection {
1111
public static readonly ID = 11;
1212
public static readonly VERSION = 1;
13-
public static readonly NAME = "usutv1";
13+
public static readonly NAME = "usut";
1414

1515
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1616

‎modules/cmpapi/src/encoder/section/UsVaV1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { CompressedBase64UrlEncoder } from "../datatype/encoder/CompressedBase64
1010
export class UsVaV1 extends AbstractEncodableBitStringSection {
1111
public static readonly ID = 9;
1212
public static readonly VERSION = 1;
13-
public static readonly NAME = "usvav1";
13+
public static readonly NAME = "usva";
1414

1515
private base64UrlEncoder: AbstractBase64UrlEncoder = new CompressedBase64UrlEncoder();
1616

‎modules/cmpapi/test/GppModel.test.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ describe("manifest.GppModel", (): void => {
3434
expect(gppModel.hasSection("tcfeuv2")).to.eql(false);
3535
expect(gppModel.hasSection("tcfcav1")).to.eql(false);
3636
expect(gppModel.hasSection("uspv1")).to.eql(false);
37-
expect(gppModel.hasSection("usnatv1")).to.eql(false);
38-
expect(gppModel.hasSection("uscav1")).to.eql(false);
39-
expect(gppModel.hasSection("usvav1")).to.eql(false);
40-
expect(gppModel.hasSection("uscov1")).to.eql(false);
41-
expect(gppModel.hasSection("usutv1")).to.eql(false);
42-
expect(gppModel.hasSection("usctv1")).to.eql(false);
37+
expect(gppModel.hasSection("usnat")).to.eql(false);
38+
expect(gppModel.hasSection("usca")).to.eql(false);
39+
expect(gppModel.hasSection("usva")).to.eql(false);
40+
expect(gppModel.hasSection("usco")).to.eql(false);
41+
expect(gppModel.hasSection("usut")).to.eql(false);
42+
expect(gppModel.hasSection("usct")).to.eql(false);
4343

4444
gppModel.setFieldValue("tcfeuv2", "Version", 2);
4545
gppModel.setFieldValue("tcfeuv2", "Created", utcDateTime);
@@ -48,22 +48,22 @@ describe("manifest.GppModel", (): void => {
4848
gppModel.setFieldValue("tcfcav1", "Created", utcDateTime);
4949
gppModel.setFieldValue("tcfcav1", "LastUpdated", utcDateTime);
5050
gppModel.setFieldValue("uspv1", "Version", 1);
51-
gppModel.setFieldValue("usnatv1", "Version", 1);
52-
gppModel.setFieldValue("uscav1", "Version", 1);
53-
gppModel.setFieldValue("usvav1", "Version", 1);
54-
gppModel.setFieldValue("uscov1", "Version", 1);
55-
gppModel.setFieldValue("usutv1", "Version", 1);
56-
gppModel.setFieldValue("usctv1", "Version", 1);
51+
gppModel.setFieldValue("usnat", "Version", 1);
52+
gppModel.setFieldValue("usca", "Version", 1);
53+
gppModel.setFieldValue("usva", "Version", 1);
54+
gppModel.setFieldValue("usco", "Version", 1);
55+
gppModel.setFieldValue("usut", "Version", 1);
56+
gppModel.setFieldValue("usct", "Version", 1);
5757

5858
expect(gppModel.hasSection("tcfeuv2")).to.eql(true);
5959
expect(gppModel.hasSection("tcfcav1")).to.eql(true);
6060
expect(gppModel.hasSection("uspv1")).to.eql(true);
61-
expect(gppModel.hasSection("usnatv1")).to.eql(true);
62-
expect(gppModel.hasSection("uscav1")).to.eql(true);
63-
expect(gppModel.hasSection("usvav1")).to.eql(true);
64-
expect(gppModel.hasSection("uscov1")).to.eql(true);
65-
expect(gppModel.hasSection("usutv1")).to.eql(true);
66-
expect(gppModel.hasSection("usctv1")).to.eql(true);
61+
expect(gppModel.hasSection("usnat")).to.eql(true);
62+
expect(gppModel.hasSection("usca")).to.eql(true);
63+
expect(gppModel.hasSection("usva")).to.eql(true);
64+
expect(gppModel.hasSection("usco")).to.eql(true);
65+
expect(gppModel.hasSection("usut")).to.eql(true);
66+
expect(gppModel.hasSection("usct")).to.eql(true);
6767

6868
let gppString = gppModel.encode();
6969
expect(gppString).to.eql(
@@ -369,12 +369,12 @@ describe("manifest.GppModel", (): void => {
369369
expect(gppModel.hasSection("tcfeuv2")).to.eql(true);
370370
expect(gppModel.hasSection("tcfcav1")).to.eql(true);
371371
expect(gppModel.hasSection("uspv1")).to.eql(true);
372-
expect(gppModel.hasSection("usnatv1")).to.eql(true);
373-
expect(gppModel.hasSection("uscav1")).to.eql(true);
374-
expect(gppModel.hasSection("usvav1")).to.eql(true);
375-
expect(gppModel.hasSection("uscov1")).to.eql(true);
376-
expect(gppModel.hasSection("usutv1")).to.eql(true);
377-
expect(gppModel.hasSection("usctv1")).to.eql(true);
372+
expect(gppModel.hasSection("usnat")).to.eql(true);
373+
expect(gppModel.hasSection("usca")).to.eql(true);
374+
expect(gppModel.hasSection("usva")).to.eql(true);
375+
expect(gppModel.hasSection("usco")).to.eql(true);
376+
expect(gppModel.hasSection("usut")).to.eql(true);
377+
expect(gppModel.hasSection("usct")).to.eql(true);
378378
});
379379

380380
it("should decode uspv1 section", (): void => {

‎modules/stub/src/stub.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ window.__gpp_stub = function () {
3737
"2:tcfeuv2",
3838
"5:tcfcav1",
3939
"6:uspv1",
40-
"7:usnatv1",
41-
"8:uscav1",
42-
"9:usvav1",
43-
"10:uscov1",
44-
"11:usutv1",
45-
"12:usctv1",
40+
"7:usnat",
41+
"8:usca",
42+
"9:usva",
43+
"10:usco",
44+
"11:usut",
45+
"12:usct",
4646
], // list of supported APIs
4747
cmpId: 0, // IAB assigned CMP ID, may be 0 during stub/loading
4848
sectionList: [],
@@ -77,12 +77,12 @@ window.__gpp_stub = function () {
7777
"2:tcfeuv2",
7878
"5:tcfcav1",
7979
"6:uspv1",
80-
"7:usnatv1",
81-
"8:uscav1",
82-
"9:usvav1",
83-
"10:uscov1",
84-
"11:usutv1",
85-
"12:usctv1",
80+
"7:usnat",
81+
"8:usca",
82+
"9:usva",
83+
"10:usco",
84+
"11:usut",
85+
"12:usct",
8686
], // list of supported APIs
8787
cmpId: 0, // IAB assigned CMP ID, may be 0 during stub/loading
8888
sectionList: [],
@@ -116,12 +116,12 @@ window.__gpp_stub = function () {
116116
"2:tcfeuv2",
117117
"5:tcfcav1",
118118
"6:uspv1",
119-
"7:usnatv1",
120-
"8:uscav1",
121-
"9:usvav1",
122-
"10:uscov1",
123-
"11:usutv1",
124-
"12:usctv1",
119+
"7:usnat",
120+
"8:usca",
121+
"9:usva",
122+
"10:usco",
123+
"11:usut",
124+
"12:usct",
125125
], // list of supported APIs
126126
cmpId: 0, // IAB assigned CMP ID, may be 0 during stub/loading
127127
sectionList: [],

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)