From 55bed604d67a31a640cd4788ae9c585f661e7419 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Wed, 6 Dec 2023 20:28:10 +0100 Subject: [PATCH] change naming --- dlt-connector/src/data/proto/3_3/CommunityRoot.ts | 4 ++-- dlt-connector/src/data/proto/3_3/GradidoCreation.ts | 4 ++-- dlt-connector/src/data/proto/3_3/GradidoDeferredTransfer.ts | 4 ++-- dlt-connector/src/data/proto/3_3/GradidoTransfer.ts | 4 ++-- dlt-connector/src/data/proto/3_3/GroupFriendsUpdate.ts | 4 ++-- dlt-connector/src/data/proto/3_3/RegisterAddress.ts | 4 ++-- dlt-connector/src/data/proto/3_3/TransactionBody.ts | 6 +++--- dlt-connector/src/data/proto/TransactionBase.ts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlt-connector/src/data/proto/3_3/CommunityRoot.ts b/dlt-connector/src/data/proto/3_3/CommunityRoot.ts index 401179d85..ec69be4f6 100644 --- a/dlt-connector/src/data/proto/3_3/CommunityRoot.ts +++ b/dlt-connector/src/data/proto/3_3/CommunityRoot.ts @@ -1,4 +1,4 @@ -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Field, Message } from 'protobufjs' import { Community } from '@entity/Community' @@ -6,7 +6,7 @@ import { Transaction } from '@entity/Transaction' // https://www.npmjs.com/package/@apollo/protobufjs // eslint-disable-next-line no-use-before-define -export class CommunityRoot extends Message implements TransactionBase { +export class CommunityRoot extends Message implements AbstractTransaction { public constructor(community?: Community) { if (community) { super({ diff --git a/dlt-connector/src/data/proto/3_3/GradidoCreation.ts b/dlt-connector/src/data/proto/3_3/GradidoCreation.ts index 354d40671..4a3ff91f9 100644 --- a/dlt-connector/src/data/proto/3_3/GradidoCreation.ts +++ b/dlt-connector/src/data/proto/3_3/GradidoCreation.ts @@ -5,7 +5,7 @@ import { TransferAmount } from './TransferAmount' import { TransactionDraft } from '@/graphql/input/TransactionDraft' import { TransactionError } from '@/graphql/model/TransactionError' import { TransactionErrorType } from '@/graphql/enum/TransactionErrorType' -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Transaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' @@ -15,7 +15,7 @@ import { Account } from '@entity/Account' // percent of group users another than the receiver // https://www.npmjs.com/package/@apollo/protobufjs // eslint-disable-next-line no-use-before-define -export class GradidoCreation extends Message implements TransactionBase { +export class GradidoCreation extends Message implements AbstractTransaction { constructor(transaction?: TransactionDraft, recipientAccount?: Account) { if (transaction) { if (!transaction.targetDate) { diff --git a/dlt-connector/src/data/proto/3_3/GradidoDeferredTransfer.ts b/dlt-connector/src/data/proto/3_3/GradidoDeferredTransfer.ts index 4693df879..ceedf579d 100644 --- a/dlt-connector/src/data/proto/3_3/GradidoDeferredTransfer.ts +++ b/dlt-connector/src/data/proto/3_3/GradidoDeferredTransfer.ts @@ -2,7 +2,7 @@ import { Field, Message } from 'protobufjs' import { GradidoTransfer } from './GradidoTransfer' import { TimestampSeconds } from './TimestampSeconds' -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Transaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' @@ -17,7 +17,7 @@ import Decimal from 'decimal.js-light' export class GradidoDeferredTransfer // eslint-disable-next-line no-use-before-define extends Message - implements TransactionBase + implements AbstractTransaction { // amount is amount with decay for time span between transaction was received and timeout // useable amount can be calculated diff --git a/dlt-connector/src/data/proto/3_3/GradidoTransfer.ts b/dlt-connector/src/data/proto/3_3/GradidoTransfer.ts index dadddedec..d68b8ccf7 100644 --- a/dlt-connector/src/data/proto/3_3/GradidoTransfer.ts +++ b/dlt-connector/src/data/proto/3_3/GradidoTransfer.ts @@ -2,7 +2,7 @@ import { Field, Message } from 'protobufjs' import { TransferAmount } from './TransferAmount' import { TransactionDraft } from '@/graphql/input/TransactionDraft' -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Transaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' @@ -10,7 +10,7 @@ import { Account } from '@entity/Account' // https://www.npmjs.com/package/@apollo/protobufjs // eslint-disable-next-line no-use-before-define -export class GradidoTransfer extends Message implements TransactionBase { +export class GradidoTransfer extends Message implements AbstractTransaction { constructor( transaction?: TransactionDraft, signingAccount?: Account, diff --git a/dlt-connector/src/data/proto/3_3/GroupFriendsUpdate.ts b/dlt-connector/src/data/proto/3_3/GroupFriendsUpdate.ts index 3d6811331..91d3693b0 100644 --- a/dlt-connector/src/data/proto/3_3/GroupFriendsUpdate.ts +++ b/dlt-connector/src/data/proto/3_3/GroupFriendsUpdate.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Field, Message } from 'protobufjs' import { Transaction } from '@entity/Transaction' @@ -8,7 +8,7 @@ import { Transaction } from '@entity/Transaction' // only CrossGroupType CROSS (in TransactionBody) // https://www.npmjs.com/package/@apollo/protobufjs // eslint-disable-next-line no-use-before-define -export class GroupFriendsUpdate extends Message implements TransactionBase { +export class GroupFriendsUpdate extends Message implements AbstractTransaction { // if set to true, colors of this both groups are trait as the same // on creation user get coins still in there color // on transfer into another group which a connection exist, diff --git a/dlt-connector/src/data/proto/3_3/RegisterAddress.ts b/dlt-connector/src/data/proto/3_3/RegisterAddress.ts index f9eead762..639b01a54 100644 --- a/dlt-connector/src/data/proto/3_3/RegisterAddress.ts +++ b/dlt-connector/src/data/proto/3_3/RegisterAddress.ts @@ -3,13 +3,13 @@ import { Field, Message } from 'protobufjs' import { AddressType } from '@/data/proto/3_3/enum/AddressType' -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Transaction } from '@entity/Transaction' // https://www.npmjs.com/package/@apollo/protobufjs // eslint-disable-next-line no-use-before-define -export class RegisterAddress extends Message implements TransactionBase { +export class RegisterAddress extends Message implements AbstractTransaction { @Field.d(1, 'bytes') public userPubkey: Buffer diff --git a/dlt-connector/src/data/proto/3_3/TransactionBody.ts b/dlt-connector/src/data/proto/3_3/TransactionBody.ts index 0783873cd..9e7eaeddd 100644 --- a/dlt-connector/src/data/proto/3_3/TransactionBody.ts +++ b/dlt-connector/src/data/proto/3_3/TransactionBody.ts @@ -13,7 +13,7 @@ import { determineCrossGroupType, determineOtherGroup } from '../transactionBody import { CommunityRoot } from './CommunityRoot' import { CommunityDraft } from '@/graphql/input/CommunityDraft' import { TransactionType } from '@/graphql/enum/TransactionType' -import { TransactionBase } from '../TransactionBase' +import { AbstractTransaction } from '../TransactionBase' import { Transaction } from '@entity/Transaction' import { timestampToDate } from '@/utils/typeConverter' import { LogError } from '@/server/LogError' @@ -95,7 +95,7 @@ export class TransactionBody extends Message { else if (this.communityRoot) return TransactionType.COMMUNITY_ROOT } - public getTransactionBase(): TransactionBase | undefined { + public getTransactionDetails(): AbstractTransaction | undefined { if (this.transfer) return this.transfer if (this.creation) return this.creation if (this.groupFriendsUpdate) return this.groupFriendsUpdate @@ -112,7 +112,7 @@ export class TransactionBody extends Message { throw new LogError("invalid TransactionBody couldn't determine transaction type") } recipe.type = transactionType.valueOf() - this.getTransactionBase()?.fillTransactionRecipe(recipe) + this.getTransactionDetails()?.fillTransactionRecipe(recipe) } public getRecipientPublicKey(): Buffer | undefined { diff --git a/dlt-connector/src/data/proto/TransactionBase.ts b/dlt-connector/src/data/proto/TransactionBase.ts index e04b3435e..82c50dcb0 100644 --- a/dlt-connector/src/data/proto/TransactionBase.ts +++ b/dlt-connector/src/data/proto/TransactionBase.ts @@ -1,7 +1,7 @@ import { TransactionValidationLevel } from '@/graphql/enum/TransactionValidationLevel' import { Transaction } from '@entity/Transaction' -export abstract class TransactionBase { +export abstract class AbstractTransaction { // validate if transaction is valid, maybe expensive because depending on level several transactions will be fetched from db public abstract validate(level: TransactionValidationLevel): boolean