taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renaming GNUNET_GETOPT-symbols to match latest changes in GNUnet

Browse Source
This commit is contained in:
Christian Grothoff 2017-03-25 21:22:22 +01:00
parent 293cd7a804
commit 8d9dc14227
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/auditor/taler-auditor-sign.c
View File

@ -139,37 +139,37 @@ main (int argc,
{
char *cfgfile = NULL;
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_FILENAME ('a',
GNUNET_GETOPT_option_filename ('a',
"auditor-key",
"FILENAME",
"file containing the private key of the auditor",
&auditor_key_file),
GNUNET_GETOPT_OPTION_CFG_FILE (&cfgfile),
GNUNET_GETOPT_OPTION_HELP ("Private key of the auditor to use for signing"),
GNUNET_GETOPT_OPTION_MANDATORY
(GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('m',
GNUNET_GETOPT_option_cfgfile (&cfgfile),
GNUNET_GETOPT_option_help ("Private key of the auditor to use for signing"),
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_base32_auto ('m',
"exchange-key",
"KEY",
"public key of the exchange (Crockford base32 encoded)",
&master_public_key)),
GNUNET_GETOPT_OPTION_STRING ('u',
GNUNET_GETOPT_option_string ('u',
"auditor-url",
"URL",
"URL of the auditor (informative link for the user)",
&auditor_url),
GNUNET_GETOPT_OPTION_MANDATORY
(GNUNET_GETOPT_OPTION_FILENAME ('r',
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_filename ('r',
"exchange-request",
"FILENAME",
"set of keys the exchange requested the auditor to sign",
&exchange_request_file)),
GNUNET_GETOPT_OPTION_FILENAME ('o',
GNUNET_GETOPT_option_filename ('o',
"output",
"FILENAME",
"where to write our signature",
&output_file),
GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv;

6
src/auditor/taler-auditor.c
View File

@ -3352,13 +3352,13 @@ main (int argc,
char *const *argv)
{
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_MANDATORY
(GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('m',
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_base32_auto ('m',
"exchange-key",
"KEY",
"public key of the exchange (Crockford base32 encoded)",
&master_pub)),
GNUNET_GETOPT_OPTION_SET_ONE ('r',
GNUNET_GETOPT_option_flag ('r',
"restart",
"restart audit from the beginning (required on first run)",
&restart),

18
src/benchmark/taler-exchange-benchmark.c
View File

@ -1562,34 +1562,34 @@ main (int argc,
struct GNUNET_OS_Process *proc;
unsigned int cnt;
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_SET_ONE ('a',
GNUNET_GETOPT_option_flag ('a',
"automate",
"Initialize and start the bank and exchange",
&run_exchange),
GNUNET_GETOPT_OPTION_MANDATORY
(GNUNET_GETOPT_OPTION_CFG_FILE (&config_file)),
GNUNET_GETOPT_OPTION_STRING ('e',
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_cfgfile (&config_file)),
GNUNET_GETOPT_option_string ('e',
"exchange-uri",
"URI",
"URI of the exchange",
&exchange_uri),
GNUNET_GETOPT_OPTION_STRING ('E',
GNUNET_GETOPT_option_string ('E',
"exchange-admin-uri",
"URI",
"URI of the administrative interface of the exchange",
&exchange_admin_uri),
GNUNET_GETOPT_OPTION_HELP ("tool to benchmark the Taler exchange"),
GNUNET_GETOPT_OPTION_SET_UINT ('s',
GNUNET_GETOPT_option_help ("tool to benchmark the Taler exchange"),
GNUNET_GETOPT_option_uint ('s',
"pool-size",
"SIZE",
"How many coins this benchmark should instantiate",
&pool_size),
GNUNET_GETOPT_OPTION_SET_UINT ('l',
GNUNET_GETOPT_option_uint ('l',
"limit",
"LIMIT",
"Terminate the benchmark after LIMIT operations",
&num_iterations),
GNUNET_GETOPT_OPTION_VERBOSE (&be_verbose),
GNUNET_GETOPT_option_verbose (&be_verbose),
GNUNET_GETOPT_OPTION_END
};
int ret;

4
src/exchange-tools/taler-exchange-dbinit.c
View File

@ -96,11 +96,11 @@ main (int argc,
char *const *argv)
{
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_SET_ONE ('r',
GNUNET_GETOPT_option_flag ('r',
"reset",
"reset database (DANGEROUS: all existing data is lost!)",
&reset_db),
GNUNET_GETOPT_OPTION_SET_ONE ('g',
GNUNET_GETOPT_option_flag ('g',
"gc",
"garbage collect database",
&gc_db),

8
src/exchange-tools/taler-exchange-keyup.c
View File

@ -1211,22 +1211,22 @@ main (int argc,
char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_FILENAME ('m',
GNUNET_GETOPT_option_filename ('m',
"master-key",
"FILENAME",
"master key file (private key)",
&masterkeyfile),
GNUNET_GETOPT_OPTION_FILENAME ('f',
GNUNET_GETOPT_option_filename ('f',
"feedir",
"DIRNAME",
"directory where to write wire transfer fee structure",
&feedir),
GNUNET_GETOPT_OPTION_FILENAME ('o',
GNUNET_GETOPT_option_filename ('o',
"output",
"FILENAME",
"auditor denomination key signing request file to create",
&auditorrequestfile),
GNUNET_GETOPT_OPTION_SET_ABSOLUTE_TIME ('t',
GNUNET_GETOPT_option_absolute_time ('t',
"time",
"TIMESTAMP",
"pretend it is a different time for the update",

12
src/exchange-tools/taler-exchange-reservemod.c
View File

@ -167,27 +167,27 @@ int
main (int argc, char *const *argv)
{
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_MANDATORY
GNUNET_GETOPT_option_mandatory
(TALER_getopt_get_amount ('a',
"add",
"DENOM",
"value to add",
&add_value)),
GNUNET_GETOPT_OPTION_MANDATORY
GNUNET_GETOPT_option_mandatory
(GNUNET_JSON_getopt ('s',
"sender",
"JSON",
"details about the sender's bank account",
&sender_details)),
GNUNET_GETOPT_OPTION_MANDATORY
GNUNET_GETOPT_option_mandatory
(GNUNET_JSON_getopt ('t',
"transfer",
"JSON",
"details that uniquely identify the bank transfer",
&transfer_details)),
GNUNET_GETOPT_OPTION_HELP ("Deposit funds into a Taler reserve"),
GNUNET_GETOPT_OPTION_MANDATORY
(GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('R',
GNUNET_GETOPT_option_help ("Deposit funds into a Taler reserve"),
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_base32_auto ('R',
"reserve",
"KEY",
"reserve (public key) to modify",

8
src/exchange-tools/taler-exchange-wire.c
View File

@ -206,23 +206,23 @@ main (int argc,
char *const *argv)
{
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_MANDATORY
GNUNET_GETOPT_option_mandatory
(GNUNET_JSON_getopt ('j',
"json",
"JSON",
"account information in JSON format",
&account_holder)),
GNUNET_GETOPT_OPTION_FILENAME ('m',
GNUNET_GETOPT_option_filename ('m',
"master-key",
"FILENAME",
"master key file (private key)",
&masterkeyfile),
GNUNET_GETOPT_OPTION_STRING ('t',
GNUNET_GETOPT_option_string ('t',
"type",
"METHOD",
"which wire transfer method (i.e. 'test' or 'sepa') is this for?",
&method),
GNUNET_GETOPT_OPTION_FILENAME ('o',
GNUNET_GETOPT_option_filename ('o',
"output",
"FILENAME",
"where to write the result",

4
src/exchange/taler-exchange-aggregator.c
View File

@ -1237,11 +1237,11 @@ main (int argc,
char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_SET_ONE ('t',
GNUNET_GETOPT_option_flag ('t',
"test",
"run in test mode and exit when idle",
&test_mode),
GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_OPTION_END
};

20
src/exchange/taler-exchange-httpd.c
View File

@ -934,35 +934,35 @@ main (int argc,
char *loglev = NULL;
char *logfile = NULL;
const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_SET_ONE ('C',
GNUNET_GETOPT_option_flag ('C',
"connection-close",
"force HTTP connections to be closed after each request",
&TEH_exchange_connection_close),
GNUNET_GETOPT_OPTION_CFG_FILE (&cfgfile),
GNUNET_GETOPT_OPTION_SET_ONE ('D',
GNUNET_GETOPT_option_cfgfile (&cfgfile),
GNUNET_GETOPT_option_flag ('D',
"disable-admin",
"do not run the /admin-HTTP server",
&no_admin),
GNUNET_GETOPT_OPTION_SET_ONE ('i',
GNUNET_GETOPT_option_flag ('i',
"init-db",
"create database tables and indicies if necessary",
&init_db),
GNUNET_GETOPT_OPTION_SET_UINT ('t',
GNUNET_GETOPT_option_uint ('t',
"timeout",
"SECONDS",
"after how long do connections timeout by default (in seconds)",
&connection_timeout),
#if HAVE_DEVELOPER
GNUNET_GETOPT_OPTION_FILENAME ('f',
GNUNET_GETOPT_option_filename ('f',
"file-input",
"FILENAME",
"run in test-mode using FILENAME as the HTTP request to process",
&input_filename),
#endif
GNUNET_GETOPT_OPTION_HELP ("HTTP server providing a RESTful API to access a Taler exchange"),
GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_option_help ("HTTP server providing a RESTful API to access a Taler exchange"),
GNUNET_GETOPT_option_loglevel (&loglev),
GNUNET_GETOPT_option_logfile (&logfile),
GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_OPTION_END
};
int ret;