[FAB-9571] Add indirect Validate() MSP caching

The MSP cache, caches the invocation of Validate, however
many of the invocations of Validate are invoked indirectly
via the identities that the MSP returns via DeserializeIdentity(),
and these invocations are not cached, because the bccsp msp's identity
simply invokes the bccsp MSP's Validate() which bypasses the cache.

Change-Id: If2c47652d080abe43abe5a22854bb13f469cd2dd
Signed-off-by: yacovm <yacovm@il.ibm.com>

Author: yacovm

msp/cache/cache.go

@@ -67,6 +67,10 @@ func (id *cachedIdentity) SatisfiesPrincipal(principal *pmsp.MSPPrincipal) error
 	return id.cache.SatisfiesPrincipal(id.Identity, principal)
 }
 
+func (id *cachedIdentity) Validate() error {
+	return id.cache.Validate(id.Identity)
+}
+
 func (c *cachedMSP) DeserializeIdentity(serializedIdentity []byte) (msp.Identity, error) {
 	c.dicMutex.Lock()
 	id, ok := c.deserializeIdentityCache.Get(string(serializedIdentity))

msp/cache/cache_test.go

@@ -213,6 +213,35 @@ func TestValidate(t *testing.T) {
 	assert.False(t, ok)
 }
 
+func TestSatisfiesValidateIndirectCall(t *testing.T) {
+	mockMSP := &mocks.MockMSP{}
+
+	mockIdentity := &mocks.MockIdentity{ID: "Alice"}
+	mockIdentity.On("Validate").Run(func(_ mock.Arguments) {
+		panic("shouldn't have invoked the identity method")
+	})
+	mockMSP.On("DeserializeIdentity", mock.Anything).Return(mockIdentity, nil).Once()
+	mockIdentity.On("GetIdentifier").Return(&msp.IdentityIdentifier{Mspid: "MSP", Id: "Alice"})
+
+	cache, err := New(mockMSP)
+	assert.NoError(t, err)
+
+	mockMSP.On("Validate", mockIdentity).Return(nil)
+
+	// Test that cache returns the correct value, and also use this to prime the cache
+	err = cache.Validate(mockIdentity)
+	mockMSP.AssertNumberOfCalls(t, "Validate", 1)
+	assert.NoError(t, err)
+	// Get the identity we test the caching on
+	identity, err := cache.DeserializeIdentity([]byte{1, 2, 3})
+	assert.NoError(t, err)
+	// Ensure the identity returned answers what the cached MSP answers.
+	err = identity.Validate()
+	assert.NoError(t, err)
+	// Ensure that although a call to Validate was called, the calls weren't passed on to the backing MSP
+	mockMSP.AssertNumberOfCalls(t, "Validate", 1)
+}
+
 func TestSatisfiesPrincipalIndirectCall(t *testing.T) {
 	mockMSP := &mocks.MockMSP{}
 	mockMSPPrincipal := &msp2.MSPPrincipal{PrincipalClassification: msp2.MSPPrincipal_IDENTITY, Principal: []byte{1, 2, 3}}

msp/mocks/mocks.go

@@ -96,8 +96,8 @@ func (*MockIdentity) GetMSPIdentifier() string {
 	panic("implement me")
 }
 
-func (*MockIdentity) Validate() error {
-	panic("implement me")
+func (m *MockIdentity) Validate() error {
+	return m.Called().Error(0)
 }
 
 func (*MockIdentity) GetOrganizationalUnits() []*msp.OUIdentifier {