diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-06-18 14:14:14 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-06-18 14:14:14 +0200 |
| commit | 3a4429aa008fdab3b5787cd5e406bfd1c556c8e0 (patch) | |
| tree | 8138dde79eef29e1e71a2ef26ed44828ccd0c37c | |
| parent | b696e1db1d1fb266e9ae29c1aea74c6d0d38546c (diff) | |
| download | exchange-3a4429aa008fdab3b5787cd5e406bfd1c556c8e0.tar.gz exchange-3a4429aa008fdab3b5787cd5e406bfd1c556c8e0.tar.bz2 exchange-3a4429aa008fdab3b5787cd5e406bfd1c556c8e0.zip | |
do not apply 'now' restriction on anchor finding
| -rw-r--r-- | contrib/mint-template/config/mint-keyup.conf | 4 | ||||
| -rw-r--r-- | src/mint-tools/taler-mint-keyup.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/contrib/mint-template/config/mint-keyup.conf b/contrib/mint-template/config/mint-keyup.conf index 7670ebf10..d8bbc9d20 100644 --- a/contrib/mint-template/config/mint-keyup.conf +++ b/contrib/mint-template/config/mint-keyup.conf @@ -24,6 +24,7 @@ value = EUR:0.10 duration_overlap = 5 minutes duration_withdraw = 7 days duration_spend = 2 years +duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.01 @@ -34,6 +35,7 @@ value = EUR:5 duration_overlap = 5 minutes duration_withdraw = 7 days duration_spend = 2 years +duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.01 @@ -44,6 +46,7 @@ value = EUR:10 duration_overlap = 5 minutes duration_withdraw = 7 days duration_spend = 2 years +duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.01 @@ -54,6 +57,7 @@ value = EUR:1000 duration_overlap = 5 minutes duration_withdraw = 7 days duration_spend = 2 years +duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.01 diff --git a/src/mint-tools/taler-mint-keyup.c b/src/mint-tools/taler-mint-keyup.c index 5eff6f58a..e9de07ef4 100644 --- a/src/mint-tools/taler-mint-keyup.c +++ b/src/mint-tools/taler-mint-keyup.c @@ -366,9 +366,8 @@ get_anchor_iter (void *cls, filename); return GNUNET_OK; } - if (stamp.abs_value_us <= now.abs_value_us) - *anchor = GNUNET_TIME_absolute_max (stamp, - *anchor); + *anchor = GNUNET_TIME_absolute_max (stamp, + *anchor); return GNUNET_OK; } @@ -419,7 +418,7 @@ get_anchor (const char *dir, "Existing keys are way too old, starting with fresh key set.\n"); *anchor = now; } - else if (anchor->abs_value_us != now.abs_value_us) // Also odd... + else if (anchor->abs_value_us != now.abs_value_us) { /* Real starting time is the last start time + duration - overlap */ *anchor = GNUNET_TIME_absolute_add (*anchor, |