From 074a0e796f64edfeec4738d124e1971aa128181c Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 16 Dec 2018 12:27:51 -0600 Subject: [PATCH] merging master --- onionr/onionrutils.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py index c353e237..7f5606ba 100644 --- a/onionr/onionrutils.py +++ b/onionr/onionrutils.py @@ -393,20 +393,12 @@ class OnionrUtils: if not self.isIntegerString(metadata[i]): logger.warn('Block metadata time stamp is not integer string or int') break -<<<<<<< HEAD isFuture = (metadata[i] - self.getEpoch()) if isFuture > maxClockDifference: logger.warn('Block timestamp is skewed to the future over the max %s: %s' (maxClockDifference, isFuture)) break if (self.getEpoch() - metadata[i]) > maxAge: logger.warn('Block is outdated: %s' % (metadata[i],)) -======= - if (metadata[i] - self.getEpoch()) > 30: - logger.warn('Block metadata time stamp is set for the future, which is not allowed.') - break - if (self.getEpoch() - metadata[i]) > maxAge: - logger.warn('Block is older than allowed: %s' % (maxAge,)) ->>>>>>> 66da0b87cf12cf75cdecd90881385b17ad2b07ef elif i == 'expire': try: assert int(metadata[i]) > self.getEpoch()