Remove the unused AddSequencedLeaf API.

Part of #2245.
google · Mar 23, 2021 · d3374d7 · d3374d7
1 parent bb6b437
commit d3374d7
Show file tree

Hide file tree

Showing 8 changed files with 431 additions and 743 deletions.
diff --git a/client/log_client.go b/client/log_client.go
@@ -326,17 +326,6 @@ func (c *LogClient) getAndVerifyInclusionProof(ctx context.Context, leafHash []b
 	return true, nil
 }
 
-// AddSequencedLeaf adds a leaf at a particular index.
-func (c *LogClient) AddSequencedLeaf(ctx context.Context, data []byte, index int64) error {
-	leaf := c.BuildLeaf(data)
-	leaf.LeafIndex = index
-	_, err := c.client.AddSequencedLeaf(ctx, &trillian.AddSequencedLeafRequest{
-		LogId: c.LogID,
-		Leaf:  leaf,
-	})
-	return err
-}
-
 // AddSequencedLeaves adds any number of pre-sequenced leaves to the log.
 // Indexes must be contiguous.
 func (c *LogClient) AddSequencedLeaves(ctx context.Context, dataByIndex map[int64][]byte) error {

diff --git a/client/log_client_test.go b/client/log_client_test.go
@@ -40,10 +40,12 @@ func addSequencedLeaves(ctx context.Context, env *integration.LogEnv, client *Lo
 	if len(leaves) == 0 {
 		return nil
 	}
+	dataByIndex := make(map[int64][]byte)
 	for i, l := range leaves {
-		if err := client.AddSequencedLeaf(ctx, l, int64(i)); err != nil {
-			return fmt.Errorf("AddSequencedLeaf(): %v", err)
-		}
+		dataByIndex[int64(i)] = l
+	}
+	if err := client.AddSequencedLeaves(ctx, dataByIndex); err != nil {
+		return fmt.Errorf("AddSequencedLeaves(): %v", err)
 	}
 	env.Sequencer.OperationSingle(ctx)
 	if err := client.WaitForInclusion(ctx, leaves[len(leaves)-1]); err != nil {

diff --git a/docs/api.md b/docs/api.md
@@ -4,8 +4,6 @@
 ## Table of Contents
 
 - [trillian_log_api.proto](#trillian_log_api.proto)
-    - [AddSequencedLeafRequest](#trillian.AddSequencedLeafRequest)
-    - [AddSequencedLeafResponse](#trillian.AddSequencedLeafResponse)
     - [AddSequencedLeavesRequest](#trillian.AddSequencedLeavesRequest)
     - [AddSequencedLeavesResponse](#trillian.AddSequencedLeavesResponse)
     - [ChargeTo](#trillian.ChargeTo)
@@ -64,38 +62,6 @@
 
 
 
-<a name="trillian.AddSequencedLeafRequest"></a>
-
-### AddSequencedLeafRequest
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| log_id | [int64](#int64) |  |  |
-| leaf | [LogLeaf](#trillian.LogLeaf) |  |  |
-| charge_to | [ChargeTo](#trillian.ChargeTo) |  |  |
-
-
-
-
-
-
-<a name="trillian.AddSequencedLeafResponse"></a>
-
-### AddSequencedLeafResponse
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| result | [QueuedLogLeaf](#trillian.QueuedLogLeaf) |  |  |
-
-
-
-
-
-
 <a name="trillian.AddSequencedLeavesRequest"></a>
 
 ### AddSequencedLeavesRequest
@@ -541,7 +507,6 @@ in this case the server will typically return an OK response that contains:
 | Method Name | Request Type | Response Type | Description |
 | ----------- | ------------ | ------------- | ------------|
 | QueueLeaf | [QueueLeafRequest](#trillian.QueueLeafRequest) | [QueueLeafResponse](#trillian.QueueLeafResponse) | QueueLeaf adds a single leaf to the queue of pending leaves for a normal log. |
-| AddSequencedLeaf | [AddSequencedLeafRequest](#trillian.AddSequencedLeafRequest) | [AddSequencedLeafResponse](#trillian.AddSequencedLeafResponse) | AddSequencedLeaf adds a single leaf with an assigned sequence number to a pre-ordered log. |
 | GetInclusionProof | [GetInclusionProofRequest](#trillian.GetInclusionProofRequest) | [GetInclusionProofResponse](#trillian.GetInclusionProofResponse) | GetInclusionProof returns an inclusion proof for a leaf with a given index in a particular tree.
 
 If the requested tree_size is larger than the server is aware of, the response will include the latest known log root and an empty proof. |

diff --git a/server/interceptor/interceptor.go b/server/interceptor/interceptor.go
@@ -405,10 +405,6 @@ func newRPCInfoForRequest(req interface{}) (*rpcInfo, error) {
 		info.tokens = len(req.GetLeaves())
 
 	// Pre-ordered Log / readwrite
-	case *trillian.AddSequencedLeafRequest:
-		info.readonly = false
-		info.treeTypes = []trillian.TreeType{trillian.TreeType_PREORDERED_LOG}
-		info.tokens = 1
 	case *trillian.AddSequencedLeavesRequest:
 		info.readonly = false
 		info.treeTypes = []trillian.TreeType{trillian.TreeType_PREORDERED_LOG}

diff --git a/server/log_rpc_server.go b/server/log_rpc_server.go
@@ -157,31 +157,6 @@ func (t *TrillianLogRPCServer) QueueLeaves(ctx context.Context, req *trillian.Qu
 	return &trillian.QueueLeavesResponse{QueuedLeaves: ret}, nil
 }
 
-// AddSequencedLeaf submits one sequenced leaf to the storage.
-func (t *TrillianLogRPCServer) AddSequencedLeaf(ctx context.Context, req *trillian.AddSequencedLeafRequest) (*trillian.AddSequencedLeafResponse, error) {
-	ctx, spanEnd := spanFor(ctx, "AddSequencedLeaf")
-	defer spanEnd()
-	if err := validateLogLeaf(req.Leaf, "AddSequencedLeafRequest.Leaf"); err != nil {
-		return nil, err
-	}
-
-	batchReq := &trillian.AddSequencedLeavesRequest{
-		LogId:  req.LogId,
-		Leaves: []*trillian.LogLeaf{req.Leaf},
-	}
-	rsp, err := t.AddSequencedLeaves(ctx, batchReq)
-	if err != nil {
-		return nil, err
-	}
-	if rsp == nil {
-		return nil, status.Errorf(codes.Internal, "missing response")
-	}
-	if got, want := len(rsp.Results), 1; got != want {
-		return nil, status.Errorf(codes.Internal, "expected 1 leaf, got %d", got)
-	}
-	return &trillian.AddSequencedLeafResponse{Result: rsp.Results[0]}, nil
-}
-
 // AddSequencedLeaves submits a batch of sequenced leaves to a pre-ordered log
 // for later integration into its underlying tree.
 func (t *TrillianLogRPCServer) AddSequencedLeaves(ctx context.Context, req *trillian.AddSequencedLeavesRequest) (*trillian.AddSequencedLeavesResponse, error) {

diff --git a/testonly/tmock/mock_log_server.go b/testonly/tmock/mock_log_server.go