taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

wallet db version belongs with wallet, not webex

Browse Source
This commit is contained in:
Florian Dold 2017-06-05 03:36:33 +02:00
parent 2904591332
commit d283331285
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet.ts
View File

@ -329,8 +329,22 @@ export interface ConfigRecord {
}
/**
* Wallet protocol version spoken with the exchange
* and merchant.
*
* Uses libtool's current:revision:age versioning.
*/
export const WALLET_PROTOCOL_VERSION = "0:0:0";
/**
* Current database version, should be incremented
* each time we do incompatible schema changes on the database.
* In the future we might consider adding migration functions for
* each version increment.
*/
export const WALLET_DB_VERSION = 18;
const builtinCurrencies: CurrencyRecord[] = [
{
auditors: [

15
src/webex/wxBackend.ts
View File

@ -39,6 +39,7 @@ import {
ConfirmReserveRequest,
CreateReserveRequest,
Stores,
WALLET_DB_VERSION,
Wallet,
} from "../wallet";
@ -53,14 +54,6 @@ import MessageSender = chrome.runtime.MessageSender;
const DB_NAME = "taler";
/**
* Current database version, should be incremented
* each time we do incompatible schema changes on the database.
* In the future we might consider adding migration functions for
* each version increment.
*/
const DB_VERSION = 18;
const NeedsWallet = Symbol("NeedsWallet");
function handleMessage(sender: MessageSender,
@ -291,7 +284,7 @@ function handleMessage(sender: MessageSender,
}
const resp: wxApi.UpgradeResponse = {
dbResetRequired,
currentDbVersion: DB_VERSION.toString(),
currentDbVersion: WALLET_DB_VERSION.toString(),
oldDbVersion: (oldDbVersion || "unknown").toString(),
}
return resp;
@ -641,7 +634,7 @@ export async function wxMain() {
*/
function openTalerDb(): Promise<IDBDatabase> {
return new Promise<IDBDatabase>((resolve, reject) => {
const req = indexedDB.open(DB_NAME, DB_VERSION);
const req = indexedDB.open(DB_NAME, WALLET_DB_VERSION);
req.onerror = (e) => {
console.log("taler database error", e);
reject(e);
@ -674,7 +667,7 @@ function openTalerDb(): Promise<IDBDatabase> {
}
break;
default:
if (e.oldVersion !== DB_VERSION) {
if (e.oldVersion !== WALLET_DB_VERSION) {
oldDbVersion = e.oldVersion;
chrome.tabs.create({
url: chrome.extension.getURL("/src/webex/pages/reset-required.html"),