remove redundant bank_url field
This commit is contained in:
parent
08a447985c
commit
add346eb6c
@ -268,11 +268,6 @@ TALER_TESTING_url_port_free (const char *url);
|
||||
*/
|
||||
struct TALER_TESTING_BankConfiguration
|
||||
{
|
||||
/**
|
||||
* Bank base URL.
|
||||
*/
|
||||
char *bank_url;
|
||||
|
||||
/**
|
||||
* Base URL of the exchange's bank account. Basically
|
||||
* @e bank_url plus the exchange account.
|
||||
|
@ -658,7 +658,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
commands,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
|
||||
|
||||
|
@ -111,11 +111,11 @@ run (void *cls,
|
||||
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
|
||||
"Bank serves at `%s'\n",
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
if (GNUNET_YES == with_fakebank)
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
commands,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
else
|
||||
TALER_TESTING_run (is,
|
||||
commands);
|
||||
@ -165,7 +165,8 @@ main (int argc,
|
||||
}
|
||||
|
||||
if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE_PYBANK,
|
||||
bc.bank_url)))
|
||||
bc.exchange_auth.
|
||||
wire_gateway_url)))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
return 77;
|
||||
|
@ -101,7 +101,7 @@ run (void *cls,
|
||||
if (GNUNET_YES == with_fakebank)
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
commands,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
else
|
||||
TALER_TESTING_run (is,
|
||||
commands);
|
||||
@ -187,7 +187,8 @@ main (int argc,
|
||||
}
|
||||
|
||||
if (NULL == (bankd = TALER_TESTING_run_bank (cfgfilename,
|
||||
bc.bank_url)))
|
||||
bc.exchange_auth.
|
||||
wire_gateway_url)))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
GNUNET_free (twister_url);
|
||||
|
@ -778,7 +778,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
commands,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
revocation,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
|
||||
|
||||
|
@ -259,7 +259,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
commands,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
|
||||
|
||||
|
@ -450,7 +450,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
all,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
|
||||
|
||||
|
@ -109,7 +109,7 @@ run (void *cls,
|
||||
|
||||
TALER_TESTING_run_with_fakebank (is,
|
||||
all,
|
||||
bc.bank_url);
|
||||
bc.exchange_auth.wire_gateway_url);
|
||||
}
|
||||
|
||||
|
||||
|
@ -361,7 +361,6 @@ TALER_TESTING_prepare_bank (const char *config_filename,
|
||||
return GNUNET_SYSERR;
|
||||
}
|
||||
GNUNET_CONFIGURATION_destroy (cfg);
|
||||
bc->bank_url = GNUNET_strdup (bc->exchange_auth.wire_gateway_url);
|
||||
bc->exchange_account_url = GNUNET_strdup (bc->exchange_auth.wire_gateway_url);
|
||||
bc->exchange_payto = exchange_payto_uri;
|
||||
bc->user42_payto = "payto://x-taler-bank/localhost/42";
|
||||
@ -451,12 +450,11 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
|
||||
(unsigned int) fakebank_port);
|
||||
|
||||
GNUNET_CONFIGURATION_destroy (cfg);
|
||||
bc->bank_url = GNUNET_strdup (bc->exchange_auth.wire_gateway_url);
|
||||
if (GNUNET_OK !=
|
||||
TALER_TESTING_url_port_free (bc->bank_url))
|
||||
TALER_TESTING_url_port_free (bc->exchange_auth.wire_gateway_url))
|
||||
{
|
||||
GNUNET_free (bc->bank_url);
|
||||
bc->bank_url = NULL;
|
||||
GNUNET_free (bc->exchange_auth.wire_gateway_url);
|
||||
bc->exchange_auth.wire_gateway_url = NULL;
|
||||
return GNUNET_SYSERR;
|
||||
}
|
||||
/* FIXME: this duplicates bc->exchange_auth.wire_gateway_url */
|
||||
|
Loading…
Reference in New Issue
Block a user