Remove references to tinkpb.Keyset (#1240)

* Proto: authorizewd_keys -> authorized_keyset * client.User * rm core/api/type * Read and Write []byte keysets
google · Mar 11, 2019 · 4b99d01 · 4b99d01
1 parent 89d0f47
commit 4b99d01
Show file tree

Hide file tree

Showing 19 changed files with 290 additions and 773 deletions.
diff --git a/cmd/keytransparency-client/cmd/post.go b/cmd/keytransparency-client/cmd/post.go
@@ -27,9 +27,8 @@ import (
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 
+	"github.com/google/keytransparency/core/client"
 	"github.com/google/keytransparency/core/crypto/tinkio"
-
-	tpb "github.com/google/keytransparency/core/api/type/type_go_proto"
 )
 
 var (
@@ -99,10 +98,10 @@ User email MUST match the OAuth account used to authorize the update.
 		if err != nil {
 			return fmt.Errorf("updateKeys() failed: %v", err)
 		}
-		u := &tpb.User{
-			UserId:         userID,
+		u := &client.User{
+			UserID:         userID,
 			PublicKeyData:  profileData,
-			AuthorizedKeys: authorizedKeys.Keyset(),
+			AuthorizedKeys: authorizedKeys,
 		}
 		timeout := viper.GetDuration("timeout")
 		cctx, cancel := context.WithTimeout(ctx, timeout)

diff --git a/core/api/type/type.proto b/core/api/type/type.proto