From bbd41f33203964f08f29169e7a9827f592c7cdaf Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Tue, 17 Jan 2017 17:54:27 +0100
Subject: [PATCH] [enh] Rename "onPluggedDALExecute" to "onDatabaseExecute"
---
app/modules/daemon.js | 2 +-
app/modules/export-bc.js | 2 +-
app/modules/gen.js | 4 ++--
app/modules/peer.js | 2 +-
app/modules/reapply.js | 2 +-
app/modules/revert.js | 4 ++--
app/modules/synchronization.js | 2 +-
index.js | 2 +-
test/integration/tools/node.js | 2 +-
test/integration/v1.0-modules-api.js | 6 +++---
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/modules/daemon.js b/app/modules/daemon.js
index 62c0c840e..e87cc9aa1 100644
--- a/app/modules/daemon.js
+++ b/app/modules/daemon.js
@@ -8,7 +8,7 @@ module.exports = {
cli: [{
name: 'start',
desc: 'Start Duniter node daemon.',
- onPluggedDALExecute: (server, conf, program, params, startServices) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params, startServices) => co(function*() {
const logger = server.logger;
logger.info(">> Server starting...");
diff --git a/app/modules/export-bc.js b/app/modules/export-bc.js
index 42c1cbecf..e5d2915e8 100644
--- a/app/modules/export-bc.js
+++ b/app/modules/export-bc.js
@@ -10,7 +10,7 @@ module.exports = {
name: 'export-bc [upto]',
desc: 'Exports the whole blockchain as JSON array, up to [upto] block number (excluded).',
logs: false,
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const upto = params[0];
const logger = server.logger;
try {
diff --git a/app/modules/gen.js b/app/modules/gen.js
index 4f185f49e..99a564d68 100644
--- a/app/modules/gen.js
+++ b/app/modules/gen.js
@@ -18,7 +18,7 @@ module.exports = {
cli: [{
name: 'gen-next [host] [port] [difficulty]',
desc: 'Tries to generate the next block of the blockchain.',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const host = params[0];
const port = params[1];
const difficulty = params[2];
@@ -27,7 +27,7 @@ module.exports = {
}, {
name: 'gen-root [host] [port] [difficulty]',
desc: 'Tries to generate root block, with choice of root members.',
- onPluggedDALExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
const host = params[0];
const port = params[1];
const difficulty = params[2];
diff --git a/app/modules/peer.js b/app/modules/peer.js
index 32846ea6b..1ebf00e96 100644
--- a/app/modules/peer.js
+++ b/app/modules/peer.js
@@ -13,7 +13,7 @@ module.exports = {
cli: [{
name: 'peer [host] [port]',
desc: 'Exchange peerings with another node',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const host = params[0];
const port = params[1];
const logger = server.logger;
diff --git a/app/modules/reapply.js b/app/modules/reapply.js
index a227551a6..1adb83f31 100644
--- a/app/modules/reapply.js
+++ b/app/modules/reapply.js
@@ -7,7 +7,7 @@ module.exports = {
cli: [{
name: 'reapply-to [number]',
desc: 'Reapply reverted blocks until block #[number] is reached. EXPERIMENTAL',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const number = params[0];
const logger = server.logger;
try {
diff --git a/app/modules/revert.js b/app/modules/revert.js
index 4e5356e77..1fb00afd6 100644
--- a/app/modules/revert.js
+++ b/app/modules/revert.js
@@ -7,7 +7,7 @@ module.exports = {
cli: [{
name: 'revert [count]',
desc: 'Revert (undo + remove) the top [count] blocks from the blockchain. EXPERIMENTAL',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const count = params[0];
const logger = server.logger;
try {
@@ -23,7 +23,7 @@ module.exports = {
},{
name: 'revert-to [number]',
desc: 'Revert (undo + remove) top blockchain blocks until block #[number] is reached. EXPERIMENTAL',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const number = params[0];
const logger = server.logger;
try {
diff --git a/app/modules/synchronization.js b/app/modules/synchronization.js
index c389a3c13..5c58eba26 100644
--- a/app/modules/synchronization.js
+++ b/app/modules/synchronization.js
@@ -7,7 +7,7 @@ module.exports = {
cli: [{
name: 'sync [host] [port] [to]',
desc: 'Synchronize blockchain from a remote Duniter node',
- onPluggedDALExecute: (server, conf, program, params) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params) => co(function*() {
const host = params[0];
const port = params[1];
const to = params[2];
diff --git a/index.js b/index.js
index 404b1d324..512d77e1c 100644
--- a/index.js
+++ b/index.js
@@ -263,7 +263,7 @@ function Stack(dependencies) {
}
}
- return yield command.onPluggedDALExecute(server, conf, program, params,
+ return yield command.onDatabaseExecute(server, conf, program, params,
// Start services and streaming between them
() => co(function*() {
diff --git a/test/integration/tools/node.js b/test/integration/tools/node.js
index 832c5fc7f..fc65b020f 100644
--- a/test/integration/tools/node.js
+++ b/test/integration/tools/node.js
@@ -160,7 +160,7 @@ function Node (dbName, options) {
cli: [{
name: 'execute',
desc: 'Unit Test execution',
- onPluggedDALExecute: (server, conf, program, params, startServices) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params, startServices) => co(function*() {
yield startServices();
callback(null, server);
yield Promise.resolve((res) => null); // Never ending
diff --git a/test/integration/v1.0-modules-api.js b/test/integration/v1.0-modules-api.js
index cff55ee69..e0a8462a0 100644
--- a/test/integration/v1.0-modules-api.js
+++ b/test/integration/v1.0-modules-api.js
@@ -88,7 +88,7 @@ describe("v1.0 Module API", () => {
cli: [{
name: 'gimme-conf',
desc: 'Returns the configuration object.',
- onPluggedDALExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
+ onDatabaseExecute: (server, conf, program, params, startServices, stopServices) => co(function*() {
// Gimme the conf!
return conf;
})
@@ -177,7 +177,7 @@ describe("v1.0 Module API", () => {
cli: [{
name: 'hello-service',
desc: 'Says hello to the world, at service phase. And feed INPUT with a transaction.',
- onPluggedDALExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
+ onDatabaseExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
yield startServices();
fakeI.push("Version: 10\n" +
"Type: Transaction\n" +
@@ -211,7 +211,7 @@ describe("v1.0 Module API", () => {
cli: [{
name: 'bye-service',
desc: 'Says goodbye to the world, at service phase.',
- onPluggedDALExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
+ onDatabaseExecute: (duniterServer, conf, program, programArgs, startServices, stopServices) => co(function*(){
yield stopServices();
return Promise.resolve();
})
--
GitLab