In change id Id992676ef2363779a7028f4799180efb027fcf47, "current" was moved into the UserID packet handling scope. This was the only thing preventing us to move the UserID packet handling code inside its own function. This patch moves the UserID packet handling code inside a new addUserID function. This is consistent with the other existing addSubKey method. "current" is renamed to "identity" for improved readability. Change-Id: I5d58eb35ab5fa9fc7d9d111fa186fec6f5e11e79 Reviewed-on: https://go-review.googlesource.com/118959 Reviewed-by: Filippo Valsorda <filippo@golang.org> Run-TryBot: Filippo Valsorda <filippo@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>