commit 8a1239ea8e63af3797771b6be12ebcb14e437671 Merge: ded18921 cea4f762 Author: Damian Johnson <atagar@torproject.org> Date: Sun Aug 26 13:47:51 2018 -0700 Move cell encryption/decription into the RelayCell class "Less is more." Dave's pull request for ticket #27112 refactored our RelayCell into a BaseRelayCell and RawRelayCell class. Think I see what he's going for, and this was a step forward in some respects. But honestly added a lot of code and complexity without functionally doing anything new. Going with a hybrid of our approaches that integrates the part I think we agree on. Namely, simplifying our Circuit's send() method by moving cell encryption/decription down into the RelayCell class. This is a much, *MUCH* smaller diff than what Dave proposed. Happy to discuss integrating more of the pull request, but lets start with the part I think we agree on to give us a common point to work from. stem/client/__init__.py | 65 +++++++++-------------- stem/client/cell.py | 111 +++++++++++++++++++++++++++++++++++++--- stem/client/datatype.py | 18 +++++-- stem/util/log.py | 2 +- stem/util/term.py | 2 +- test/unit/client/cell.py | 1 + test/unit/client/size.py | 1 + test/unit/control/controller.py | 1 - 8 files changed, 145 insertions(+), 56 deletions(-)