From 33ba8b9dacef932319c405d23e7dd51425d5644b Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 18 Apr 2015 06:19:54 +0000 Subject: [PATCH] Remove explicit Registration.key.encoder --- letsencrypt/acme/messages2.py | 3 +-- letsencrypt/acme/messages2_test.py | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/letsencrypt/acme/messages2.py b/letsencrypt/acme/messages2.py index 7f4050c24..f4c1e9dce 100644 --- a/letsencrypt/acme/messages2.py +++ b/letsencrypt/acme/messages2.py @@ -136,8 +136,7 @@ class Registration(ResourceBody): # on new-reg key server ignores 'key' and populates it based on # JWS.signature.combined.jwk - key = jose.Field('key', omitempty=True, - decoder=jose.JWK.from_json, encoder=jose.JWK.to_json) + key = jose.Field('key', omitempty=True, decoder=jose.JWK.from_json) contact = jose.Field('contact', omitempty=True, default=()) recovery_token = jose.Field('recoveryToken', omitempty=True) agreement = jose.Field('agreement', omitempty=True) diff --git a/letsencrypt/acme/messages2_test.py b/letsencrypt/acme/messages2_test.py index e162af1d0..bebed64fa 100644 --- a/letsencrypt/acme/messages2_test.py +++ b/letsencrypt/acme/messages2_test.py @@ -93,23 +93,25 @@ class RegistrationTest(unittest.TestCase): key=key, contact=contact, recovery_token=recovery_token, agreement=agreement) - self.jobj = { + self.jobj_to = { 'contact': contact, 'recoveryToken': recovery_token, 'agreement': agreement, - 'key': key.fully_serialize(), + 'key': key, } + self.jobj_from = self.jobj_to.copy() + self.jobj_from['key'] = key.fully_serialize() def test_to_json(self): - self.assertEqual(self.jobj, self.reg.to_json()) + self.assertEqual(self.jobj_to, self.reg.to_json()) def test_from_json(self): from letsencrypt.acme.messages2 import Registration - self.assertEqual(self.reg, Registration.from_json(self.jobj)) + self.assertEqual(self.reg, Registration.from_json(self.jobj_from)) def test_from_json_hashable(self): from letsencrypt.acme.messages2 import Registration - hash(Registration.from_json(self.jobj)) + hash(Registration.from_json(self.jobj_from)) class ChallengeResourceTest(unittest.TestCase):