Marcello Stanisci
9b6717ae3a
addressing #4521
2016-10-19 23:07:07 +02:00
Christian Grothoff
8fe6f64db3
fix recently introduced JSON pack format string errors
2016-10-19 00:14:34 +02:00
Christian Grothoff
be055f1b92
fix recently introduced double-free
2016-10-19 00:09:10 +02:00
Christian Grothoff
70462f0b94
implement #4497/#4705 -- addition of unique numeric error codes -- for the server-side of the exchange
2016-10-18 23:05:29 +02:00
Marcello Stanisci
006177a01f
@author
2016-10-18 12:34:57 +02:00
Marcello Stanisci
93f1fb5fc3
indent
2016-10-17 23:51:09 +02:00
Marcello Stanisci
c015ffc7fc
closing #4709
2016-10-17 17:24:38 +02:00
Marcello Stanisci
f1f6e504d5
defining all but one exchangedb-for-audit functions
2016-10-17 16:39:56 +02:00
Marcello Stanisci
448a8be76d
starting with #4709
2016-10-17 01:48:59 +02:00
Christian Grothoff
ecce56c052
Merge branch 'master' of git+ssh://taler.net/exchange
2016-10-14 01:45:27 +02:00
Christian Grothoff
6987837f08
fix #4730 : amount coult end up being zero, so check should be for SYSERR, not for OK (as zero implies NO)
2016-10-14 01:43:55 +02:00
Florian Dold
b1afd5edfa
logging for refresh
2016-10-13 23:27:21 +02:00
Christian Grothoff
32d23e7499
fix returning wrong status code to MHD on malformed /refresh/reveal request
2016-10-13 23:13:09 +02:00
Christian Grothoff
2948fd6466
fix disting: auditor.conf moved
2016-10-10 17:02:03 +02:00
Christian Grothoff
25618c561e
check dbinit return value to not fail hard if DB not available
2016-10-10 16:54:37 +02:00
Christian Grothoff
808dc10bf4
add skeletons for new DB API functions
2016-10-09 01:17:37 +02:00
Christian Grothoff
6621ec8fb7
expanding exchange DB API to meet auditor requirements (not implemented, just adding the function signatures)
2016-10-09 00:57:31 +02:00
Christian Grothoff
8bbcf86678
more work on auditordb plugin API
2016-10-08 23:37:55 +02:00
Christian Grothoff
fa1ca946c9
actually, the auditor only sees the hash of the public keys initially
2016-10-08 19:11:54 +02:00
Christian Grothoff
42da43c18c
add missing #include
2016-10-08 19:04:21 +02:00
Marcello Stanisci
f03c1175df
typo
2016-10-07 18:21:12 +02:00
Christian Grothoff
56efe31c40
Merge branch 'master' of ssh://taler.net:/var/git/exchange
2016-10-07 02:52:39 +02:00
Christian Grothoff
f5a2134da8
move taler-auditor-sign tool to auditor/ direcotory
2016-10-06 16:38:42 +02:00
Christian Grothoff
26478f0f1f
fix having multiple primary keys
2016-10-06 16:33:07 +02:00
Christian Grothoff
0394080600
first draft for an auditor table structure
2016-10-06 16:30:19 +02:00
Christian Grothoff
b68adb93c6
adding skeleton code for auditor
2016-10-06 15:17:10 +02:00
Marcello Stanisci
a42155d552
Adding struct to be signed over related to #4702
2016-10-03 14:08:14 +02:00
Marcello Stanisci
9cea8197b5
defining merchant's signature for successful payments
2016-10-03 10:32:17 +02:00
Christian Grothoff
f1a71f180c
mint->exchange leftovers
2016-09-30 23:19:18 +02:00
Marcello Stanisci
f00a49e40c
fixing aggregator hanging after bank's error
2016-09-30 13:47:46 +02:00
Christian Grothoff
e72a7188ac
-stylistic improvement: use numbers for counters instead of GNUNET_OK, etc.
2016-09-29 16:30:57 +02:00
Marcello Stanisci
6082645d12
removing garbage from config file (made testcase fail)
2016-09-28 20:39:37 +02:00
Marcello Stanisci
81148fb6df
typo
2016-09-28 20:32:34 +02:00
Marcello Stanisci
0b8081fe22
Adding receiver in TALER_ContractPS ( #4651 )
2016-09-26 16:55:10 +02:00
Christian Grothoff
77f11bcfac
include execution time in signed message for /track/transfer ( #4578 )
2016-09-26 15:08:00 +02:00
Christian Grothoff
df8c011b95
return execution time also from exchange C API ( #4578 )
2016-09-26 14:58:44 +02:00
Christian Grothoff
302a08b701
implement that /track/transaction returns execution time ( #4578 )
2016-09-26 14:50:49 +02:00
Christian Grothoff
265fc74b65
check return values, fix use of uninit memory on certain error handling paths
2016-09-23 16:52:13 +02:00
Christian Grothoff
f43bac5894
fix #4673
2016-09-23 15:56:44 +02:00
Christian Grothoff
7234e063a7
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-09-23 14:07:12 +02:00
Christian Grothoff
dc4cbbc060
reduce log level
2016-09-23 14:07:08 +02:00
Marcello Stanisci
64b7126234
strtol -> strtoll, which made the anchor (see signkey generation algorithm)
...
always point to the 70s, so new signkeys were always generated
2016-09-20 14:30:38 +02:00
Marcello Stanisci
b3c4803c55
renaming local variable
2016-09-20 13:11:39 +02:00
Florian Dold
1078a42847
Regenerate keys before withdraw period is over.
...
Before, we only would create new denomination keys when
the spending period is over.
2016-09-07 17:41:07 +02:00
Christian Grothoff
5a6a3da8e4
updating DB schema to profit from new KDF-based refresh variant
2016-08-11 23:28:33 +02:00
Christian Grothoff
dd724c009d
finished implementing session-hash based reveal checking
2016-08-11 22:43:26 +02:00
Christian Grothoff
bcd5a51a7e
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-08-11 22:19:14 +02:00
Christian Grothoff
0bfc7bcbf9
re-compute refresh session hash in reveal step
2016-08-11 22:19:12 +02:00
Jeff Burdges
3115c6acc6
Kinda seems to work
2016-08-11 22:18:04 +02:00
Jeff Burdges
1f39f7e92b
This might fix the compile error
2016-08-11 21:28:48 +02:00
Jeff Burdges
cdcd67a27d
Use KDF better
...
We now send the secret_seed to the skm variable, while sending the
counter salt to the xts variable. I have not check this with
http://eprint.iacr.org/2010/264 but it seems correct.
Indeed rsa_blinding_key_derive places the strong source of
randomness in skm too, and uses a constant string for xts.
2016-08-08 12:43:59 +02:00
Jeff Burdges
7958464696
Copy bit twiddling from libgcrypt/cipher/ecc.c
...
Reversed order buisness agrees with KC's experence from gnunet-rs
2016-08-08 10:38:07 +02:00
Christian Grothoff
0fd6cf19af
mostly working migration of the DH-seeded refresh variant
2016-08-07 23:21:49 +02:00
Christian Grothoff
745719dbc1
first half of changing refresh protocol to derive all key data from DH
2016-08-05 16:08:19 +02:00
Christian Grothoff
e800772c85
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-07-13 16:02:13 +02:00
Christian Grothoff
0973bca1e4
-be explicit about transaction mode
2016-07-13 16:02:08 +02:00
Marcello Stanisci
59c6856284
fixing #4594
2016-07-07 17:55:25 +02:00
Christian Grothoff
855b78f837
fix #4591
2016-06-26 13:44:22 +02:00
Christian Grothoff
9035b9d324
-distfix
2016-06-20 17:45:02 +02:00
Christian Grothoff
ffb6fb608a
-bumps for release
2016-06-20 17:44:10 +02:00
Christian Grothoff
0fb17e2b70
now that we have a separate bind, do not check for perms anymore
2016-06-20 11:32:04 +02:00
Marcello Stanisci
17c8741e20
typo
2016-06-16 11:22:07 +02:00
Marcello Stanisci
c22a25c22b
typo
2016-06-16 00:22:20 +02:00
Christian Grothoff
8c7406cb42
check refresh amounts add up correctly, fix linker issue
2016-06-15 22:55:05 +02:00
Christian Grothoff
c38a7c5518
more sanity checks, better clean up
2016-06-15 22:55:05 +02:00
Christian Grothoff
754c4ef24c
nicer reports
...
-fix leak
-fix leaks
2016-06-15 22:55:02 +02:00
Christian Grothoff
0c3f6dde25
add support to collect basic metrics and to terminate automatically
2016-06-15 22:55:02 +02:00
Christian Grothoff
c2bb85ffdd
first working version of benchmark logic
2016-06-15 22:55:01 +02:00
Christian Grothoff
f59246e763
clean up blobs
...
clean up blobs
clean up blobs
clean up blobs
pass -c option to taler services, ship with reasonable config
exclude live-keys from config
2016-06-15 22:54:58 +02:00
Christian Grothoff
3876b70eb4
merge refresh closure into struct Coin
2016-06-15 16:42:43 +02:00
Christian Grothoff
e4b9a151a6
restructure benchmark logic so that we can schedule each operation independently
2016-06-15 16:36:17 +02:00
Christian Grothoff
b31c62039d
avoid passing int's as void*'s in benchmark logic
2016-06-15 16:04:29 +02:00
Christian Grothoff
7588f08238
make exchange URI a command-line option
2016-06-15 15:41:17 +02:00
Christian Grothoff
c32cc081ee
misc minor stylistic fixes to benchmark tool:
2016-06-15 15:09:57 +02:00
Marcello Stanisci
7b9272d3e8
left=0 after successful reveal
2016-06-14 15:58:25 +02:00
Marcello Stanisci
1a7619d54e
comments
2016-06-14 15:53:48 +02:00
Marcello Stanisci
a34a2873ca
reconstructing array of denominations for coins gotten
...
by melting dynamically; as reported in msg (0010890) of
#4576 '
2016-06-14 15:51:58 +02:00
Marcello Stanisci
0e9651210d
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-14 13:10:10 +02:00
Christian Grothoff
389c18c18c
add file for error codes
2016-06-14 09:50:59 +02:00
Marcello Stanisci
18c22e3e2e
fixing corrupted DLL (resulting from double call to json_decref())
2016-06-13 23:40:00 +02:00
Christian Grothoff
62b7bbabed
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-06-13 16:36:13 +02:00
Christian Grothoff
6cd71bebbf
implement #4569
2016-06-13 16:36:10 +02:00
Marcello Stanisci
738d0d008e
adding re-withdrawing of spent and non-refreshed coins
2016-06-13 15:42:08 +02:00
Christian Grothoff
2a58f470af
-indentation
2016-06-11 20:42:21 +02:00
Christian Grothoff
c668eace47
-indentation, dox
2016-06-11 19:58:06 +02:00
Christian Grothoff
030b7716ae
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-06-11 18:22:44 +02:00
Christian Grothoff
766fb6e282
fixing more leaks
2016-06-11 18:22:33 +02:00
Marcello Stanisci
23c6dba981
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-11 18:03:30 +02:00
Marcello Stanisci
4f4bad310b
placing refreshed coins where all coins are
2016-06-11 18:01:57 +02:00
Marcello Stanisci
6bd7d2fc85
defining struct for refreshed coins
2016-06-11 17:35:15 +02:00
Christian Grothoff
f4b013b3d4
fix leaks
2016-06-11 17:11:38 +02:00
Christian Grothoff
6fb30ce468
fix memory leaks
2016-06-11 16:59:03 +02:00
Christian Grothoff
63612f4976
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-06-11 16:47:25 +02:00
Christian Grothoff
2886187a02
fix leaks
2016-06-11 16:47:13 +02:00
Marcello Stanisci
44f2ac5194
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-11 16:31:44 +02:00
Marcello Stanisci
3d9e2b89be
addressing #4572
2016-06-11 16:31:33 +02:00
Christian Grothoff
06622fbf8e
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-06-11 16:17:03 +02:00
Christian Grothoff
ce5587b427
fix memory leaks: json_array_append increments RC
2016-06-11 16:16:49 +02:00
Marcello Stanisci
afb10e1d9e
fixing segfault (due to a double free)
2016-06-11 16:11:00 +02:00
Marcello Stanisci
809cf5d604
polishing comments
2016-06-11 16:07:33 +02:00
Marcello Stanisci
e52574e9b9
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-11 14:34:04 +02:00
Marcello Stanisci
d7f38a845a
addressing compiler warnings
2016-06-11 14:33:52 +02:00
Christian Grothoff
7dc075ae28
check return values of json_array_append
2016-06-11 13:54:11 +02:00
Christian Grothoff
5d28c01900
fix intent
2016-06-11 00:36:41 +02:00
Marcello Stanisci
dd7687a5f7
fixing segfault
2016-06-10 22:35:38 +02:00
Marcello Stanisci
1db423907e
fixing melting according to the refresh_probability=1 used in debugging circumstances'
2016-06-10 16:27:31 +02:00
Christian Grothoff
0f85142d27
-do not ignore error code...
2016-06-10 16:07:51 +02:00
Christian Grothoff
96b6bca54d
-do not ignore error code...
2016-06-10 16:06:27 +02:00
Marcello Stanisci
8c13b6242b
first steps in refresh reveal in benchmark
2016-06-10 16:04:03 +02:00
Marcello Stanisci
2da3c046b2
melting logic (still no reveal) in benchmark
2016-06-10 15:22:32 +02:00
Marcello Stanisci
dafde95d85
addressing compilation warnings
2016-06-10 13:52:40 +02:00
Marcello Stanisci
621a8172a1
preparing refresh blob
2016-06-10 01:04:09 +02:00
Marcello Stanisci
9f23e213cf
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-09 23:35:35 +02:00
Marcello Stanisci
fc07c4c159
- picking needed JSONs from files instead of hardcoding
...
- populating (by hand) the array of denominations needed for refreshing
- minor fixes
2016-06-09 23:35:05 +02:00
Christian Grothoff
42e2d51e53
note similarity in code
2016-06-09 21:59:24 +02:00
Christian Grothoff
3f4d668463
refactor track_transfer 200 handling, fix minor leak
2016-06-09 21:51:49 +02:00
Christian Grothoff
4a412841ba
-typo
2016-06-09 21:44:42 +02:00
Christian Grothoff
e484438837
rename source files to match API URIs
2016-06-09 21:43:26 +02:00
Christian Grothoff
3672005350
rename source files to match API URIs
2016-06-09 21:43:10 +02:00
Christian Grothoff
bb511560fe
move TALER_TrackTransferDetails to taler_crypto_lib.h as it is not exchange-specific
2016-06-09 21:03:07 +02:00
Christian Grothoff
ecf0689c75
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-06-09 19:18:30 +02:00
Christian Grothoff
75c04b8af2
rename /deposit/wtid and /wire/deposits to /track/{transaction,transfer} for improved consistency
2016-06-09 19:18:13 +02:00
Marcello Stanisci
d450303890
removing decref from wring place
2016-06-09 17:22:15 +02:00
Christian Grothoff
35f3c30717
exit aggregator if we failed to connect to DB
2016-06-09 15:39:54 +02:00
Christian Grothoff
421b4f403f
integrate child_death_task with aggregator struct, and cancel it on error
2016-06-09 15:20:24 +02:00
Christian Grothoff
e1b2900ebe
more verbose message to help diagnose issues
2016-06-09 14:54:50 +02:00
Christian Grothoff
c179734ccf
make code build against revised GNUnet blind signing API
2016-06-09 14:52:00 +02:00
Christian Grothoff
3b9248e9c6
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-06-08 22:14:24 +02:00
Christian Grothoff
536163746e
check currency on /admin/add/incoming ( #4565 )
2016-06-08 22:14:15 +02:00
Marcello Stanisci
f50d4b0f35
json_decref in shutdown
2016-06-08 17:34:46 +02:00
Marcello Stanisci
feb60291b6
getting banking details through config file in benchmark
2016-06-08 17:11:33 +02:00
Marcello Stanisci
46c593f93e
- calling exchange via GNUNET_OS_ interface
...
- getting currency via /keys
- adding -c option
(benchmark)
2016-06-08 16:12:31 +02:00
Christian Grothoff
a7379930d2
turn libfakebank into libtalerfakebank so we can use it for testcases in the merchant
2016-06-08 11:35:28 +02:00
Marcello Stanisci
7714356611
first steps in refreshing in benchmark
2016-06-07 17:41:16 +02:00
Marcello Stanisci
11703131a3
Merge branch 'master' of ssh://taler.net/var/git/exchange
2016-06-07 17:12:39 +02:00
Marcello Stanisci
ca8e309877
adding find_pk() to benchmark
2016-06-07 16:58:55 +02:00
Christian Grothoff
166352e87e
add exchange_pub to callbacks
2016-06-07 15:14:44 +02:00
Christian Grothoff
8d329a0256
merge
2016-06-06 23:55:31 +02:00
Christian Grothoff
7d281b63be
fixing compiler warnings, indentation, etc.
2016-06-06 23:53:54 +02:00
Marcello Stanisci
8c120f30f4
fixing segfault when shutting down benchmark, but now it hangs..
2016-06-06 22:40:33 +02:00
Marcello Stanisci
2f6c57f351
spending logic in benchmark
2016-06-06 16:53:42 +02:00
Christian Grothoff
0fef44159a
improve error message to diagnose #4559
2016-06-05 22:03:09 +02:00
Marcello Stanisci
69756317cd
freeing in shutdown
2016-06-04 01:48:20 +02:00
Marcello Stanisci
f1858fc1f4
withdrawing coins and picking the ones to spend according to a given probability (see macro SPEND_PROBABILITY), for benchmarking
2016-06-04 01:29:42 +02:00
Marcello Stanisci
4843a41fc4
generating (global) blinding key for benchmark
2016-06-03 19:39:04 +02:00
Marcello Stanisci
a1029430b3
fixing benchmark compilation
2016-06-03 14:18:42 +02:00
Marcello Stanisci
9259c2bc69
anti-segfault comments, cancelling pending operation when shutting down benchmark
2016-06-03 02:28:57 +02:00
Marcello Stanisci
ece2f5f389
creating reserves for benchmark
2016-06-03 01:23:16 +02:00
Christian Grothoff
16bdd871f4
remove useless check
2016-06-02 10:02:07 +02:00
Christian Grothoff
df9a1770de
remove useless check
2016-06-02 10:01:09 +02:00
Christian Grothoff
7680ebcbe1
check fcntl() return value
2016-06-02 09:36:24 +02:00
Christian Grothoff
06fe1d34f3
adding missing unlock
2016-06-02 09:06:03 +02:00
Christian Grothoff
71d05c6c93
adding missing va_end
2016-06-02 09:04:46 +02:00
Christian Grothoff
90aa044e61
remove duplciate check
2016-06-02 09:02:50 +02:00
Christian Grothoff
b405b02875
remove unnecessary check
2016-06-02 08:59:18 +02:00
Christian Grothoff
026673bd37
fix
2016-05-31 20:35:50 +02:00
Christian Grothoff
07449ce578
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-05-31 18:59:19 +02:00
Christian Grothoff
bc7c9e686e
implementing #3474
2016-05-31 18:58:59 +02:00
Christian Grothoff
c6d1fb3ceb
del
2016-05-31 14:32:34 +02:00
Christian Grothoff
ce3d7c360b
add support for /keys cache control ( #4036 )
2016-05-31 14:32:06 +02:00
Marcello Stanisci
c2c85d0004
Merge branch 'master' of ssh://taler.net/var/git/exchange
...
Conflicts:
src/benchmark/taler-exchange-benchmark
2016-05-31 11:09:19 +02:00
Marcello Stanisci
bfd3ce29d1
untracking binary
2016-05-31 11:08:29 +02:00
Marcello Stanisci
9164edd590
linking benchmark using $(top_builddir) instead of -l in Makefile.am
2016-05-31 11:05:49 +02:00
Christian Grothoff
0cef479e00
extend test to cover GC
2016-05-31 10:39:11 +02:00
Christian Grothoff
eb1fdc105c
implement GC logic ( #3485 )
2016-05-31 09:34:45 +02:00
Christian Grothoff
ba0146b878
add -g option to taler-exchange-dbinit
2016-05-31 09:16:09 +02:00
Christian Grothoff
94e1679955
adding a few more uniqueness constraints to DB
2016-05-31 09:13:03 +02:00
Marcello Stanisci
ef81e9db22
comments
2016-05-30 18:57:16 +02:00
Marcello Stanisci
66201bf917
invoking benchmark_run() after getting /keys from exchange. Still doesn't work with https
2016-05-30 18:45:57 +02:00
Marcello Stanisci
925097c86d
adding --pool-size option to benchmark,
...
correcting comments
2016-05-30 17:16:01 +02:00
Marcello Stanisci
848c7f0e4f
benchmark makefile
2016-05-30 15:08:12 +02:00
Christian Grothoff
e68d07fc25
making DB scheme nice
2016-05-27 15:34:24 +02:00
Christian Grothoff
5f6f524a52
a first step towards normalizing the DB a bit and not storing data redundantly
2016-05-27 14:39:04 +02:00
Christian Grothoff
172e8494b9
a first step towards normalizing the DB a bit and not storing data redundantly
2016-05-27 14:34:57 +02:00
Christian Grothoff
2f5e58f3c7
a first step towards normalizing the DB a bit and not storing data redundantly
2016-05-27 14:14:13 +02:00
Christian Grothoff
54504b7f37
a first step towards normalizing the DB a bit and not storing data redundantly
2016-05-27 14:04:29 +02:00
Christian Grothoff
0ccb420f4c
rename to avoid ambiguity
2016-05-27 12:03:26 +02:00
Christian Grothoff
8b701a2c62
add ON DELETE CASCADE refs where applicable
2016-05-27 11:55:07 +02:00
Christian Grothoff
c0451f0982
fix #4533 for exchange (breaks interaction with bank for /admin/add/incoming)
2016-05-26 16:38:59 +02:00
Christian Grothoff
3f468773e7
change edate to wire_transfer_deadline/delay ( #4521 )
2016-05-26 15:23:46 +02:00
Christian Grothoff
951ce5ef32
fix #4537
2016-05-25 19:12:44 +02:00
Christian Grothoff
079ef7cb6f
fixing #4520 : be more aggressive at asserting when API is violated
2016-05-24 20:37:23 +02:00
Christian Grothoff
f471cfcec5
add a few more DB constraints
2016-05-24 20:32:05 +02:00
Christian Grothoff
32bb3b14bf
fix #4483
2016-05-24 20:13:31 +02:00
Florian Dold
8c3ffbf2a3
allow access to raw /keys response
2016-05-24 02:28:15 +02:00
Christian Grothoff
8dfb3b87b4
testing refund, fixing bugs, refund test passes
2016-05-21 19:22:03 +02:00
Christian Grothoff
9160245167
make use of GNUNET_JSON_from_data_auto where possible
2016-05-21 18:36:12 +02:00
Christian Grothoff
93aaf1d172
extending interpreter to cover refund (but not used yet)
2016-05-20 17:15:50 +02:00
Christian Grothoff
e39beff272
fix init before use in new refund logic
2016-05-20 15:52:40 +02:00
Christian Grothoff
35509528bc
enforce wire deadline >= refund_deadline in exchange
2016-05-20 15:39:24 +02:00
Christian Grothoff
43cfa77248
enforce wire deadline >= refund_deadline in API
2016-05-20 15:36:08 +02:00
Christian Grothoff
324003acc0
log cause for /admin/add/incoming failures
2016-05-20 14:25:02 +02:00
Christian Grothoff
9391ed529c
export function to free commit coin data
2016-05-19 18:37:31 +02:00
Christian Grothoff
7d8a74adf1
allow env override
2016-05-19 18:26:06 +02:00
Christian Grothoff
14436d1241
finished implementing #4401
2016-05-19 17:47:27 +02:00
Christian Grothoff
8199c06882
more work on #4401 , almost done
2016-05-19 17:31:15 +02:00
Christian Grothoff
9dab61c91a
more work on #4401
2016-05-19 17:11:35 +02:00
Christian Grothoff
f2b20f3ad0
more work towards fixing #4401
2016-05-19 16:24:29 +02:00
Christian Grothoff
763c8ab512
rename GNUNET_CRYPTO_rsa_BlindingKey to GNUNET_CRYPTO_RsaBlindingKey following GNUnet API change
2016-05-19 15:11:05 +02:00
Christian Grothoff
a39e2f9e00
working on DB test, unfinished
2016-05-19 15:10:31 +02:00
Christian Grothoff
daff72b63f
fix #4506 : check that master key matches our master key when loading signing and denomination keys; also do not send master_pub with each signing key, that is not in the spec
2016-05-18 17:58:32 +02:00
Christian Grothoff
396f29ab9e
warn properly if we failed to run taler-exchange-aggregator
2016-05-18 17:23:21 +02:00
Christian Grothoff
8ff8c7b8c7
fix table dropping logic to ensure testcases run in fresh environment
2016-05-18 17:19:32 +02:00
Christian Grothoff
e905e9e245
use GNUNET_new_array()
2016-05-16 17:13:00 +02:00
Christian Grothoff
edf4e5cdf7
not all are 2d
2016-05-16 12:01:20 +02:00
Christian Grothoff
60c7d0f312
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-05-16 11:56:10 +02:00
Christian Grothoff
c8b9370413
fixing #3814 by removing ability to melt multiple oldcoins at the same time
2016-05-16 11:55:47 +02:00
Marcello Stanisci
5d2b56c3c3
MASTER_KEY in section merchant-exchange-test used to point exchange's private key. Fixed
2016-05-11 01:56:34 +02:00
Marcello Stanisci
93175857c9
uncommenting PORT in config
2016-05-11 01:30:30 +02:00
Marcello Stanisci
17512aa538
merchant private key in config generator
2016-05-10 22:06:55 +02:00
Marcello Stanisci
be53397fb9
adding EDATE in merchant config generator
2016-05-10 19:38:38 +02:00
Marcello Stanisci
e10fc753df
typo
2016-05-10 15:03:00 +02:00
Marcello Stanisci
9aa8fa0d70
typo: tears->years
2016-05-10 14:23:59 +02:00
Marcello Stanisci
4a65642805
typo
2016-05-10 13:51:18 +02:00
Marcello Stanisci
cfb0f5bdbc
including config generator among installed files
2016-05-10 13:50:01 +02:00
Christian Grothoff
068dbf020b
reorg testcase a bit
2016-05-08 16:07:17 +02:00
Christian Grothoff
ffb38f292e
adding test for wire prepare data
2016-05-08 15:51:40 +02:00
Christian Grothoff
966242341a
expand testcase to cover refund API, fix minor issues
2016-05-08 15:44:44 +02:00
Christian Grothoff
691c9a859f
more work on test, noting what is left to do with bug number
2016-05-06 23:53:04 +02:00
Christian Grothoff
d55b2cd59d
more work on test, noting what is left to do
2016-05-06 23:51:15 +02:00
Christian Grothoff
d6d0ddbe07
check if starting aggregator actually worked
2016-05-06 22:07:19 +02:00
Christian Grothoff
0292d9d68a
fix shutdown issue in test
2016-05-06 22:03:07 +02:00
Christian Grothoff
ce1dcfe1ed
add timeout logic to aggregator test
2016-05-06 22:01:02 +02:00
Christian Grothoff
95d338f6cc
adding test for auditors API
2016-05-06 19:39:31 +02:00
Christian Grothoff
fd7e855759
refactoring exchangedb tests to improve coverage
2016-05-06 19:23:02 +02:00
Christian Grothoff
187fa67f3c
refactoring exchangedb tests to improve coverage
2016-05-06 19:22:39 +02:00
Christian Grothoff
3526c44a38
refactor code to write signing keys in same module where we read them
2016-05-06 18:33:02 +02:00
Christian Grothoff
c334ba61f4
drop refunds table as well
2016-05-06 13:38:20 +02:00
Christian Grothoff
fb2ef1d5d9
bump copyright
2016-05-06 13:35:12 +02:00
Christian Grothoff
302070b86e
support REFUNDS in transaction history in libtalerexchange
2016-05-06 13:33:20 +02:00
Christian Grothoff
fbbc49bdad
add logic to return refunds with transaction history
2016-05-06 13:03:57 +02:00
Christian Grothoff
a4d99f229a
implement logic to store refund data into postgres database
2016-05-06 12:55:44 +02:00
Christian Grothoff
0c959e75d1
working on #3641 : more on /refund implementation
2016-05-05 22:57:55 +02:00
Christian Grothoff
07d9978fb9
implementing #4449
2016-05-05 17:40:38 +02:00
Christian Grothoff
6040adab4f
fixing #4461
2016-05-05 15:03:43 +02:00
Christian Grothoff
6b1f4904ef
export transaction history check function
2016-05-05 14:43:13 +02:00
Christian Grothoff
ad6a40aaa5
fix fmt string issues
2016-05-04 13:21:22 +02:00
Christian Grothoff
458992dc6f
fixes for disting
2016-05-04 10:21:35 +02:00
Christian Grothoff
c1575167f7
fix make dist
2016-05-04 10:09:17 +02:00
Christian Grothoff
4a031a692b
implementing /refund API ( #3848 )
2016-05-04 09:42:52 +02:00
Christian Grothoff
c0e3021040
dead code elimination
2016-05-04 06:59:48 +02:00
Christian Grothoff
4553681476
fix issues in tracking API and tracking API test, resolves #4399
2016-05-04 06:10:41 +02:00
Christian Grothoff
910e01d1c1
be more careful with terminology
2016-05-04 05:38:29 +02:00
Christian Grothoff
2c832199b2
check WTID matches
2016-05-04 05:36:23 +02:00
Christian Grothoff
c1253703ae
fix size in purpose
2016-05-04 05:30:06 +02:00
Christian Grothoff
991d13178b
fix JSON format string
2016-05-04 05:21:39 +02:00
Christian Grothoff
27300ad1cc
round exec time
2016-05-04 05:19:47 +02:00
Christian Grothoff
9f0245ca99
modify test to trigger aggregation properly and check resulting fakebank transfers
2016-05-04 05:16:32 +02:00
Christian Grothoff
dc2d0a186c
towards fixing #4399
2016-05-03 13:55:40 +02:00
Christian Grothoff
79c316f0d5
enable multiple wire methods to be used with aggregator, add command to run aggregator in testcase
2016-05-03 07:57:49 +02:00
Christian Grothoff
f2b7e36269
finish tests for #4437
2016-05-03 06:15:09 +02:00
Christian Grothoff
eabbafc4df
adding assertions to assist figuring out #4482
2016-05-03 05:52:37 +02:00
Christian Grothoff
5852baa7e9
fix testcase
2016-05-02 09:06:16 +02:00
Christian Grothoff
08ef15ec94
adding bank-lib test against fakebank (currently fails) -- towards addressing #4437
2016-05-02 08:54:05 +02:00
Christian Grothoff
31ad6aaf11
separate interpreter from the rest of the test logic
2016-05-02 08:46:17 +02:00
Christian Grothoff
5fd6a25c6d
code simplification via new extended libgnunetcurl API
2016-05-02 08:24:21 +02:00
Christian Grothoff
ad45e5ab7a
adjust shutdown/timeout to match latest GNUnet scheduler API semantics
2016-05-02 06:48:25 +02:00
Christian Grothoff
1cbba4bec1
fixing #4462 : avoid temporary schemata altogether
2016-05-02 06:36:58 +02:00
Christian Grothoff
53e7547aaf
removing broken and redundant testcase
2016-05-02 05:17:42 +02:00
Christian Grothoff
b98a204562
fix #4184
2016-05-02 05:10:40 +02:00
Christian Grothoff
1c2be591d3
fixing #4479
2016-05-02 02:33:14 +02:00
Christian Grothoff
d34c6401b4
fixing #4470
2016-05-02 01:30:13 +02:00
Christian Grothoff
7fe7f66ffa
update use to match new GNUnet scheduler API
2016-04-30 10:58:35 +02:00
Christian Grothoff
2c3dc44a20
Merge branch 'master' of ssh://taler.net:/var/git/exchange into HEAD
2016-04-28 22:07:04 +02:00
Florian Dold
e7e14f3009
misspelt variable
2016-04-26 21:49:48 +02:00
Florian Dold
d17629bf72
create directories
2016-04-26 21:46:44 +02:00
Florian Dold
ad40c23390
check_permissions for AF_UNIX
2016-04-26 14:16:35 +02:00
Florian Dold
bf0ee981ff
typo
2016-04-25 21:30:54 +02:00
Florian Dold
34f9900f66
chmod instead of fchmod
2016-04-25 21:30:13 +02:00
Florian Dold
4656f7f883
missing free
2016-04-25 21:23:08 +02:00
Florian Dold
9488d72347
missing newline in log
2016-04-25 21:19:01 +02:00
Florian Dold
99f8434e50
typo
2016-04-25 21:18:00 +02:00
Florian Dold
5b4d2ed1be
octal
2016-04-25 21:17:16 +02:00
Florian Dold
275296311f
comment
2016-04-25 20:51:19 +02:00
Florian Dold
37266ffacd
socket permissions
2016-04-25 20:36:47 +02:00
Florian Dold
edd704fa73
precheck for UDS
2016-04-25 20:25:05 +02:00
Florian Dold
57728835cf
use GNUnet helpers
2016-04-25 20:22:06 +02:00
Florian Dold
c2c2b92ed4
implement serving exchange via unix domain sockets
2016-04-25 16:20:38 +02:00
Florian Dold
423565e74b
fix CURRENCY section in test case
2016-04-25 13:47:59 +02:00
Christian Grothoff
47c3a489e2
presumably fixing #4455 . A check did exist (see taler-exchange-httpd_deposit.c:225), but the two checks disagreed whether it was OK for the fee to be exactly equal to the amount. Now both checks allow the fee to be equal to the amount.
2016-04-25 00:31:23 +02:00
Christian Grothoff
fbbf35c87f
fix #4438
2016-04-25 00:26:34 +02:00
Florian Dold
95e52cd2e8
make names related to wire plugins less generic
2016-04-22 19:09:55 +02:00
Florian Dold
9507c8c369
base config varname
2016-04-22 16:11:19 +02:00
Florian Dold
ad321624be
add taler-arm wrapper
2016-04-22 15:17:02 +02:00
Christian Grothoff
21188ca703
Merge branch 'master' of ssh://taler.net:/var/git/exchange
2016-04-21 20:00:40 +02:00
Christian Grothoff
77e9e3a7f6
sketching out refund API implementation
2016-04-20 03:05:16 +02:00
Christian Grothoff
edd31c7415
implementing parsing of /refund requests
2016-04-20 02:50:52 +02:00
Christian Grothoff
f693e25793
introduce refund fee
2016-04-20 01:50:26 +02:00
Christian Grothoff
1d8da4bf84
unset env variable instead of setting to empty
2016-04-20 01:50:16 +02:00
Florian Dold
fda03a481f
add missing file
2016-04-19 23:43:11 +02:00
Florian Dold
e01143daf3
move currency to taler section, create taler.conf
2016-04-19 23:41:07 +02:00
Florian Dold
f9d4a96715
move currency to taler section
2016-04-19 23:11:57 +02:00
Florian Dold
6d551b3073
unnecessary include
2016-04-19 14:44:53 +02:00
Florian Dold
37be942f48
do not include gnunet's platform header in our public headers
2016-04-19 13:54:59 +02:00
Christian Grothoff
8d503b17e3
move fake bank implementation to new library to re-use the code in upcoming testcases in preparation of fixing #4399
2016-04-17 23:14:23 +02:00
Christian Grothoff
4dcd70ac2b
fix #4400 : add test for amount_round wire plugin API
2016-04-17 22:46:49 +02:00
Christian Grothoff
a881e44944
update code to match new API
2016-04-17 20:03:57 +02:00
Christian Grothoff
7496a03978
replace bank_api_context with libgnunetcurl
2016-04-17 18:03:01 +02:00
Christian Grothoff
1ed567a14b
replace exchange_api_context with libgnunetcurl
2016-04-17 17:45:15 +02:00
Christian Grothoff
05751b63aa
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-04-17 16:28:50 +02:00
Christian Grothoff
2c693bcb72
fix comments
2016-04-17 16:28:37 +02:00
Christian Grothoff
dda069f5f9
fix linker issue
2016-04-16 19:53:01 +02:00
Christian Grothoff
719b51b65d
fix config parsing for dbinit tool
2016-04-16 19:49:53 +02:00
Christian Grothoff
a34891981c
make all exchange-tools load configs properly like other Taler tools
2016-04-16 13:57:22 +02:00
Christian Grothoff
3abb3bc372
use user_config_file as well
2016-04-16 13:10:29 +02:00
Christian Grothoff
f552b7e4c0
use exchange section consistently for master_priv_file option
2016-04-16 12:46:01 +02:00
Christian Grothoff
fe36ba0062
fix taler-exchange-wire way of loading configuration
2016-04-16 12:44:45 +02:00
Christian Grothoff
ecc5b6791f
fix taler-exchange-keyup way of loading configuration
2016-04-16 12:37:37 +02:00
Christian Grothoff
480b9cdf39
automatically set 'type' in taler-exchange-wire
2016-04-15 20:08:19 +02:00
Christian Grothoff
663363fc0e
Fix #4229
2016-04-15 19:41:44 +02:00
Florian Dold
bcf4b7f724
gitignore
2016-04-15 15:41:11 +02:00
Christian Grothoff
74e237164c
Merge branch 'master' of ssh://taler.net:/var/git/exchange
2016-04-15 15:00:26 +02:00
Christian Grothoff
ebf049a8c2
add missing rollback
2016-04-15 15:00:24 +02:00
Florian Dold
3098c0a9e0
new taler-bank-manage invocation
2016-04-14 01:19:32 +02:00
Florian Dold
c234a8bed8
Create taler-config wrapper around gnunet-config
...
The wrapper uses LD_PRELOAD to make sure that paths are adjusted
for taler.
2016-04-13 15:58:02 +02:00
Florian Dold
9f9d41dd06
set currency to default bank currency for test case
2016-04-11 23:58:02 +02:00
Florian Dold
7e648c042c
account numbers start at 1
2016-04-11 23:44:09 +02:00
Florian Dold
21ea107cc0
newline
2016-04-11 21:10:20 +02:00
Christian Grothoff
cb987575c1
check exchange signature on /wire/deposit response ( #4135 )
2016-04-11 20:16:58 +02:00
Christian Grothoff
ce9dd3365d
implement signing of /wire/deposit replies ( #4135 )
2016-04-11 19:54:54 +02:00
Christian Grothoff
3a5902b590
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-04-11 19:27:26 +02:00
Christian Grothoff
a2bb69910a
refactor /wire/deposit response generation to do all JSON logic in httpd_responses.c
2016-04-11 19:27:18 +02:00
Christian Grothoff
a7f2496795
adding wire plugin tests, resolving #4357
2016-04-11 15:59:24 +02:00
Christian Grothoff
58373f2a92
adding new test, still failing
2016-04-11 13:16:12 +02:00
Christian Grothoff
aee99021a7
reduce unnecessary #includes
2016-04-11 13:02:58 +02:00
Christian Grothoff
af91cd87d6
use libtalerwire instead of duplicating logic
2016-04-11 13:01:20 +02:00
Christian Grothoff
b018d4d5b0
implementing #4357 , but test missing
2016-04-11 02:37:56 +02:00
Christian Grothoff
30d66bcebc
fixing #4386 : use more sane configuration and data file structure
2016-04-10 17:10:20 +02:00
Christian Grothoff
5fb65f59b2
add testcase for profiteering from rounding, also passes, this concludes #4141
2016-04-10 14:28:54 +02:00
Christian Grothoff
71107a7b3d
expanding aggregator testcase
2016-04-10 02:52:46 +02:00
Christian Grothoff
6e90ef9f4a
implement selection by wire_deadline as documented
2016-04-10 02:43:09 +02:00
Christian Grothoff
bf92166be3
do not clear result until end of iteration over results
2016-04-10 02:14:07 +02:00
Christian Grothoff
0dee91e014
changing code to meet latest change in GNUNET_SCHEDULER API
2016-04-10 00:57:20 +02:00
Christian Grothoff
df893df505
fix make dist rules
2016-04-09 01:56:24 +02:00
Christian Grothoff
43e9ac9471
recent changes to GNUNET_OS-IPK logic make plugin.c obsolete
2016-04-07 23:06:05 +02:00
Christian Grothoff
e00370d4f5
removing duplication of --help logic
2016-04-07 22:52:23 +02:00
Christian Grothoff
d986269dae
for #4374
2016-04-07 11:09:30 +02:00
Christian Grothoff
148dda09d4
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
2016-04-07 09:33:04 +02:00
Christian Grothoff
8df75214f4
install data and plugins in taler-exchange, not taler
2016-04-07 09:30:58 +02:00
Christian Grothoff
d28d1e82f3
install configuration template file in share/taler/config.d/
2016-04-07 09:27:55 +02:00
Christian Grothoff
a96c7177aa
get simple aggregation test to pass
2016-04-06 12:04:51 +02:00
Christian Grothoff
aee021aa37
update ignore file, fix compiler warning
2016-04-06 11:27:51 +02:00
Christian Grothoff
07541d319c
address 'shutdown' TODO in taler-exchange-aggregator
2016-04-06 11:24:33 +02:00
Christian Grothoff
4977a3eb8f
address 'global_ret' simplification TODO
2016-04-06 10:34:42 +02:00
Christian Grothoff
ad8351c912
fix iterate_matching_deposits(), LIMIT does not work with variables in Postgres ( #4360 )
2016-04-06 10:22:09 +02:00
Christian Grothoff
f3819ae60d
undef dead symbol
2016-04-05 23:45:05 +02:00
Christian Grothoff
afb1ab2a11
-fix mem leaks
2016-04-04 17:40:51 +02:00
Christian Grothoff
0ff76b5abb
fix test to ensure DB invariants are met
2016-04-04 16:47:11 +02:00
Christian Grothoff
bd6fb59e4b
skeletons for other commands
2016-04-04 16:06:30 +02:00
Christian Grothoff
13f1c1c195
implementing /deposit for test
2016-04-04 15:58:40 +02:00
Christian Grothoff
6eb2e73ee0
implementing /deposit for test
2016-04-04 15:47:09 +02:00
Christian Grothoff
db44dc3e95
how to run expect_transaction example
2016-04-04 15:07:01 +02:00
Christian Grothoff
a72661fd29
add bank logic to log transactions
2016-04-04 14:43:42 +02:00
Christian Grothoff
c83e22d199
add MHD skeleton logic
2016-04-04 14:26:24 +02:00
Christian Grothoff
7401433644
make use of r36977/78 API improvement in GNUnet
2016-04-04 14:04:44 +02:00
Christian Grothoff
9909a04d5b
use new PQ_query_param_string function to fix 0-termination bug, also terminate idle aggregator in test mode
2016-04-03 21:41:26 +02:00
Christian Grothoff
08e9c29570
Fix testcase to match latest spec without receiver_
2016-04-03 21:10:10 +02:00
Christian Grothoff
1dea7998db
fix json generation, use proper json in test
2016-04-03 21:08:24 +02:00
Christian Grothoff
daae3d3ddf
change taler-exchange-sepa to a more generic taler-exchange-wire tool using the wire plugins ( #4237 )
2016-04-02 20:58:22 +02:00
Christian Grothoff
937078bbdc
fix NPE
2016-04-01 21:00:05 +02:00
Christian Grothoff
d7d33b6812
set environment variable to ensure plugins are found during tests
2016-04-01 20:35:22 +02:00
Christian Grothoff
bf3e5487b4
fix newline
2016-04-01 20:32:44 +02:00
Christian Grothoff
1168010160
fix error message
2016-04-01 20:30:52 +02:00
Christian Grothoff
1c568f8eb6
fix testcase init with new API
2016-04-01 20:27:57 +02:00
Christian Grothoff
4154e41a41
hash inputs to sign_fdh functions as required by new API
2016-04-01 20:18:18 +02:00
Christian Grothoff
9bc96506bb
update man pages and templates to use current options
2016-04-01 17:32:10 +02:00
Christian Grothoff
76c8ab07e1
fix testcase with new path detection logic
2016-04-01 17:14:30 +02:00
Christian Grothoff
de3e26303e
implementing #4356 , tests still failing, but main logic should now be updated
2016-04-01 16:15:35 +02:00
Christian Grothoff
92907bee45
return nicer error message from bank API and fix compiler warning
2016-04-01 08:37:44 +02:00
Christian Grothoff
3a2e547da9
use GNUnet-SVN #36970 API improvement to de-duplicate code in Taler
2016-03-31 20:56:16 +02:00
Christian Grothoff
b4c4f0b078
towards a testcase for aggregation logic
2016-03-30 22:56:17 +02:00
Christian Grothoff
3938ad4d20
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-03-26 18:18:58 +01:00
Christian Grothoff
17b2c7e011
fix indent, fix some comments
2016-03-26 18:18:57 +01:00
Christian Grothoff
73a0510705
use bank and exchange account numbers in test
2016-03-23 18:38:57 +01:00
Christian Grothoff
e76154e076
ref to bug #4340
2016-03-23 11:34:50 +01:00
Christian Grothoff
ac950fbe61
switch to wid to comply with spec
2016-03-23 11:34:24 +01:00
Christian Grothoff
7f7ac5d92c
avoid waiting forever
2016-03-23 10:06:41 +01:00
Christian Grothoff
d57576d5dd
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-03-23 10:04:56 +01:00
Christian Grothoff
08a051a7c0
update test_bank_api to match current bank setup methods
2016-03-23 10:04:40 +01:00
Jeff Burdges
2e0067d9dd
Merge branch 'master' of git.taler.net:/var/git/exchange
2016-03-21 15:19:43 +01:00
Jeff Burdges
130957f69d
Note two errors in the tests suit
2016-03-21 15:19:04 +01:00
Christian Grothoff
6a80c0bfa2
Merge branch 'master' of git+ssh://git.taler.net/var/git/exchange
2016-03-21 14:40:59 +01:00
Christian Grothoff
3cb188e8a7
rename to match GNUnet symbol change
2016-03-21 14:40:57 +01:00
Jeff Burdges
553d6eb23e
API change in GNUnet crypto for Full Domain Hashing
2016-03-21 10:57:12 +01:00
Christian Grothoff
6f8fa678c1
implementing #3987
2016-03-21 01:45:53 +01:00
Christian Grothoff
737e3f4bf6
refactor to eliminate duplicated JSON parsing logic ( #4150 )
2016-03-19 19:16:35 +01:00
Christian Grothoff
3d5e096fa2
eliminate warning
2016-03-19 19:14:19 +01:00
Christian Grothoff
1c4b72cb47
fix test script escaping
2016-03-19 18:50:48 +01:00
Christian Grothoff
362b275c7d
fix test script escaping
2016-03-19 18:50:40 +01:00
Christian Grothoff
ae726ea31b
remove duplicated JSON parsing code from exchange-lib ( #4150 )
2016-03-19 15:54:21 +01:00
Christian Grothoff
0d1eced630
first refactoring of JSON logic to address #4150 and #4237
2016-03-19 15:23:11 +01:00
Christian Grothoff
77801f054a
exclude priv keys
2016-03-15 20:09:59 +01:00
Christian Grothoff
aba92c5bfa
modify /wire/test to provide bank URI and bank account numbers
2016-03-04 11:57:57 +01:00
Christian Grothoff
d06fb4d818
towards returning account numbers in /wire/test
2016-03-04 11:43:11 +01:00
Christian Grothoff
17ff4f5e97
fixing #4230 in bank-lib
2016-03-02 21:07:27 +01:00
Christian Grothoff
531272a92a
towards fixing #4230
2016-03-02 21:02:46 +01:00
Christian Grothoff
68f1a7b4a6
fix JSON for test wire formats to pass wire format validation
2016-03-01 16:13:54 +01:00
Christian Grothoff
f746efecf7
rename section from exchange-wire- to wire-
2016-03-01 16:10:41 +01:00
Christian Grothoff
fc0f9d0aaa
fix rename issue
2016-03-01 16:02:20 +01:00
Christian Grothoff
89a7de3d30
fix config
2016-03-01 15:58:22 +01:00