feat(ui): resolve conflict

Author: Vu Van Duc

src/keri/app/aiding.ts

@@ -1,12 +1,11 @@
-import { components } from '../../types/keria-api-schema.ts';
+import { components, Tier } from '../../types/keria-api-schema.ts';
 import { b, Ilks, Serials, Vrsn_1_0 } from '../core/core.ts';
 import { incept, interact, reply, EndRoleAddAttributes, rotate } from '../core/eventing.ts';
 import { parseRangeHeaders } from '../core/httping.ts';
 import { IdentifierManagerFactory } from '../core/keeping.ts';
 import { HabState } from '../core/keyState.ts';
 import { Algos } from '../core/manager.ts';
 import { MtrDex } from '../core/matter.ts';
-import { Tier } from '../core/salter.ts';
 import { Serder } from '../core/serder.ts';
 import { Tholder } from '../core/tholder.ts';
 

src/keri/app/controller.ts

@@ -1,3 +1,4 @@
+import { Tier } from '../../types/keria-api-schema.ts';
 import { Cipher } from '../core/cipher.ts';
 import { b, Ilks, Serials, Vrsn_1_0 } from '../core/core.ts';
 import { Decrypter } from '../core/decrypter.ts';
@@ -7,7 +8,7 @@ import { incept, InceptEventSAD, interact, InteractEventSAD, rotate } from '../c
 import { SaltyCreator } from '../core/manager.ts';
 import { MtrDex } from '../core/matter.ts';
 import { CesrNumber } from '../core/number.ts';
-import { Salter, Tier } from '../core/salter.ts';
+import { Salter } from '../core/salter.ts';
 import { Seqner } from '../core/seqner.ts';
 import { Serder } from '../core/serder.ts';
 import { Signer } from '../core/signer.ts';

src/keri/core/keeping.ts

@@ -1,3 +1,4 @@
+import { Tier } from '../../types/keria-api-schema.ts';
 import { Encrypter } from '../core/encrypter.ts';
 import { Cipher } from './cipher.ts';
 import { b } from './core.ts';
@@ -14,7 +15,7 @@ import {
 import { Algos, RandyCreator, SaltyCreator } from './manager.ts';
 import { MtrDex } from './matter.ts';
 import { Prefixer } from './prefixer.ts';
-import { Salter, Tier } from './salter.ts';
+import { Salter } from './salter.ts';
 import { Signer } from './signer.ts';
 
 /** External module definition */

src/keri/core/manager.ts

@@ -1,10 +1,11 @@
+import { Tier } from '../../types/keria-api-schema.ts';
 import { Cigar } from './cigar.ts';
 import { b } from './core.ts';
 import { Decrypter } from './decrypter.ts';
 import { Diger } from './diger.ts';
 import { Encrypter } from './encrypter.ts';
 import { MtrDex } from './matter.ts';
-import { Salter, Tier } from './salter.ts';
+import { Salter } from './salter.ts';
 import { Siger } from './siger.ts';
 import { Signer } from './signer.ts';
 import { Verfer } from './verfer.ts';

test-integration/utils/test-util.ts

@@ -6,14 +6,14 @@ import signify, {
     ready,
     Salter,
     SignifyClient,
-    Tier,
     HabState,
     ExternalModule,
 } from 'signify-ts';
 import { RetryOptions, retry } from './retry.ts';
 import assert from 'assert';
 import { resolveEnvironment } from './resolve-env.ts';
 import { expect } from 'vitest';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 export interface Aid {
     name: string;

test/app/aiding.test.ts

@@ -12,9 +12,9 @@ import {
     IdentifierDeps,
     IdentifierManagerFactory,
     randomPasscode,
-    Tier,
 } from '../../src/index.ts';
 import { createMockIdentifierState } from './test-utils.ts';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 const bran = '0123456789abcdefghijk';
 

test/app/clienting.test.ts

@@ -22,9 +22,9 @@ import {
     HEADER_SIG_INPUT,
     HEADER_SIG_TIME,
 } from '../../src/keri/core/httping.ts';
-import { Tier } from '../../src/keri/core/salter.ts';
 import libsodium from 'libsodium-wrappers-sumo';
 import { createMockFetch } from './test-utils.ts';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 const fetchMock = createMockFetch();
 

test/app/contacting.test.ts

@@ -1,8 +1,8 @@
 import { assert, describe, it } from 'vitest';
 import { SignifyClient } from '../../src/keri/app/clienting.ts';
-import { Tier } from '../../src/keri/core/salter.ts';
 import libsodium from 'libsodium-wrappers-sumo';
 import { createMockFetch } from './test-utils.ts';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 const fetchMock = createMockFetch();
 

test/app/controller.test.ts

@@ -4,7 +4,8 @@ import libsodium from 'libsodium-wrappers-sumo';
 import { openManager } from '../../src/keri/core/manager.ts';
 import { Signer } from '../../src/keri/core/signer.ts';
 import { MtrDex } from '../../src/keri/core/matter.ts';
-import { Tier, randomPasscode } from '../../src/index.ts';
+import { randomPasscode } from '../../src/index.ts';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 describe('Controller', () => {
     it('manage account AID signing and agent verification', async () => {

test/app/coring.test.ts

@@ -7,9 +7,9 @@ import {
     OperationsDeps,
 } from '../../src/keri/app/coring.ts';
 import { SignifyClient } from '../../src/keri/app/clienting.ts';
-import { Tier } from '../../src/keri/core/salter.ts';
 import { randomUUID } from 'node:crypto';
 import { createMockFetch } from './test-utils.ts';
+import { Tier } from '../../src/types/keria-api-schema.ts';
 
 const url = 'http://127.0.0.1:3901';
 const boot_url = 'http://127.0.0.1:3903';