Unverified Commit 7fd367d1 authored by Cédric Moreau's avatar Cédric Moreau Committed by GitHub
Browse files

Merge pull request #1154 from duniter/typage 

Typage
parents a7a7e5fa 89fa0a52

app/lib/constants.ts

+6 −1
Original line number Diff line number Diff line 
"use strict";

import {CommonConstants} from "./common-libs/constants"

import {OtherConstants} from "./other_constants"

import { ProverConstants } from '../modules/prover/lib/constants';



const UDID2        = "udid2;c;([A-Z-]*);([A-Z-]*);(\\d{4}-\\d{2}-\\d{2});(e\\+\\d{2}\\.\\d{2}(\\+|-)\\d{3}\\.\\d{2});(\\d+)(;?)";

const PUBKEY       = CommonConstants.FORMATS.PUBKEY
@@ -114,7 +115,11 @@ module.exports = { 
  },

  PROOF_OF_WORK: {

    EVALUATION: 1000,

    UPPER_BOUND: CommonConstants.PROOF_OF_WORK.UPPER_BOUND.slice()

    UPPER_BOUND: CommonConstants.PROOF_OF_WORK.UPPER_BOUND.slice(),

    DEFAULT: {

      CPU: ProverConstants.DEFAULT_CPU,

      PREFIX: ProverConstants.DEFAULT_PEER_ID

    }

  },



  DEFAULT_CURRENCY_NAME: "no_currency",

app/lib/dal/fileDAL.ts

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ export class FileDAL { 
  }



  saveTransaction(tx:DBTx) {

    return this.txsDAL.addPending(TransactionDTO.fromJSONObject(tx))

    return this.txsDAL.addPending(tx)

  }



  async getTransactionsHistory(pubkey:string) {

app/lib/dal/sqliteDAL/CertDAL.ts

+3 −2
Original line number Diff line number Diff line 
import {SQLiteDriver} from "../drivers/SQLiteDriver"

import {AbstractSQLite} from "./AbstractSQLite"

import {SandBox} from "./SandBox"

import { SandBox } from './SandBox';

import { DBDocument } from './DocumentDAL';



const constants = require('../../constants');



export interface DBCert {

export interface DBCert extends DBDocument {

  linked:boolean

  written:boolean

  written_block:null

app/lib/dal/sqliteDAL/DocumentDAL.ts

0 → 100644
+3 −0
Original line number Diff line number Diff line 
export interface DBDocument {

  issuers?: string[]

}
 
 No newline at end of file

app/lib/dal/sqliteDAL/IdentityDAL.ts

+3 −2
Original line number Diff line number Diff line 
import {AbstractSQLite} from "./AbstractSQLite"

import {SQLiteDriver} from "../drivers/SQLiteDriver"

import {SandBox} from "./SandBox"

import { SandBox } from './SandBox';

import {IdentityDTO} from "../../dto/IdentityDTO"

import {Cloneable} from "../../dto/Cloneable";

import { DBDocument } from './DocumentDAL';

const constants = require('../../constants');



export abstract class DBIdentity implements Cloneable {
@@ -143,7 +144,7 @@ export class ExistingDBIdentity extends DBIdentity { 
  }

}



export interface DBSandboxIdentity extends DBIdentity {

export interface DBSandboxIdentity extends DBIdentity,DBDocument {

  certsCount: number

  ref_block: number

}