From 5ae20e945fa1aa957e311fadd08dcf0aa1bae767 Mon Sep 17 00:00:00 2001 From: QiTao Weng Date: Sat, 10 Apr 2021 09:23:54 +0000 Subject: [PATCH] Reformat --- src/app/units/Blockchain.ts | 24 ++++++++--------- src/app/units/FirebaseUnit.ts | 6 ++--- src/app/units/rtdb/Transaction.ts | 44 +++++++++++++++---------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/app/units/Blockchain.ts b/src/app/units/Blockchain.ts index 8b5067d..0746eea 100644 --- a/src/app/units/Blockchain.ts +++ b/src/app/units/Blockchain.ts @@ -11,33 +11,33 @@ import { collect, uuid_v4 } from "@extollo/util" * Utility wrapper class for a block in the chain. */ export class Block implements BlockResourceItem { - firebaseID: string; - seqID: number; - uuid: string; - transactions: BlockTransaction[]; - timestamp: number; - lastBlockHash: string; - lastBlockUUID: string; - proof: string; + firebaseID: string + seqID: number + uuid: string + transactions: BlockTransaction[] + timestamp: number + lastBlockHash: string + lastBlockUUID: string + proof: string get config(): Config { return Application.getApplication().make(Config) } constructor(rec: BlockResourceItem) { - this.firebaseID = rec.firebaseID; + this.firebaseID = rec.firebaseID this.seqID = rec.seqID this.uuid = rec.uuid this.transactions = rec.transactions this.lastBlockHash = rec.lastBlockHash this.lastBlockUUID = rec.lastBlockUUID - this.proof = rec.proof; - this.timestamp = rec.timestamp; + this.proof = rec.proof + this.timestamp = rec.timestamp } /** Returns true if this is the genesis block. */ async isGenesis() { // first block will be guaranteed uuid 0000 if (this.uuid !== '0000') { - return false; + return false } const proof = this.proof const publicKey = this.config.get("app.gpg.key.public") diff --git a/src/app/units/FirebaseUnit.ts b/src/app/units/FirebaseUnit.ts index 57e8b3b..55dd825 100644 --- a/src/app/units/FirebaseUnit.ts +++ b/src/app/units/FirebaseUnit.ts @@ -1,5 +1,5 @@ -import {Singleton, Inject} from "@extollo/di" -import {Unit, Logging, Config} from "@extollo/lib" +import { Singleton, Inject } from "@extollo/di" +import { Unit, Logging, Config } from "@extollo/lib" import * as firebase from "firebase-admin" export type RTDBRef = 'peers' | 'transaction' | 'block' @@ -11,7 +11,7 @@ export type RTDBRef = 'peers' | 'transaction' | 'block' */ @Singleton() export class FirebaseUnit extends Unit { - protected _firebase = firebase; + protected _firebase = firebase @Inject() protected readonly logging!: Logging diff --git a/src/app/units/rtdb/Transaction.ts b/src/app/units/rtdb/Transaction.ts index 96facfa..75056bf 100644 --- a/src/app/units/rtdb/Transaction.ts +++ b/src/app/units/rtdb/Transaction.ts @@ -1,9 +1,9 @@ -import {FirebaseUnit} from "../FirebaseUnit" -import {TransactionResource, TransactionResourceItem} from "../../rtdb/TransactionResource" -import {Singleton, Inject} from "@extollo/di" -import {Unit, Logging} from "@extollo/lib" +import { FirebaseUnit } from "../FirebaseUnit" +import { TransactionResource, TransactionResourceItem } from "../../rtdb/TransactionResource" +import { Singleton, Inject } from "@extollo/di" +import { Unit, Logging } from "@extollo/lib" import * as openpgp from "openpgp" -import {Blockchain} from "../Blockchain" +import { Blockchain } from "../Blockchain" /** * Transaction Unit @@ -18,7 +18,7 @@ export class Transaction extends Unit { @Inject() protected readonly blockchain!: Blockchain - public async compareTransactions(transaction1: TransactionResourceItem, transaction2: TransactionResourceItem){ + public async compareTransactions(transaction1: TransactionResourceItem, transaction2: TransactionResourceItem) { // verify signature const result1 = await openpgp.verify({ publicKeys: await openpgp.readKey({ @@ -38,9 +38,9 @@ export class Transaction extends Unit { armoredSignature: transaction2.validationSignature // parse detached signature }) }) - return await (result1.signatures[0].verified) && await (result2.signatures[0].verified); + return await (result1.signatures[0].verified) && await (result2.signatures[0].verified) } - + public async up() { this.firebase.ref("transaction").on("value", async () => { // array of pairs of tranaction resource items @@ -51,25 +51,25 @@ export class Transaction extends Unit { transactions.each(transaction1 => { // for each item that is not itself transactions.where("combinedHash", "!=", transaction1.combinedHash) - // get a second item - .each(transaction2 => { - //if the item matches - if (this.compareTransactions(transaction1, transaction2)) { - // and remove the two matching items - transactions = transactions.whereNotIn("combinedHash", [transaction1.combinedHash, transaction2.combinedHash]) - // insert grouped items into groupedTransactions - groupedTransactions.push([transaction1, transaction2]); - } - }) + // get a second item + .each(transaction2 => { + //if the item matches + if (this.compareTransactions(transaction1, transaction2)) { + // and remove the two matching items + transactions = transactions.whereNotIn("combinedHash", [transaction1.combinedHash, transaction2.combinedHash]) + // insert grouped items into groupedTransactions + groupedTransactions.push([transaction1, transaction2]) + } + }) }) for (const group of groupedTransactions) { - await this.blockchain.submitTransactions(group); - await this.firebase.ref("transaction").child(group[0].firebaseID).remove(); - await this.firebase.ref("transaction").child(group[1].firebaseID).remove(); + await this.blockchain.submitTransactions(group) + await this.firebase.ref("transaction").child(group[0].firebaseID).remove() + await this.firebase.ref("transaction").child(group[1].firebaseID).remove() } }) } - + public async down() { } }