fix test

totegamma · Feb 25, 2024 · c608e56 · c608e56
1 parent 0793f71
commit c608e56
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/cmd/api/wire_gen.go b/cmd/api/wire_gen.go
diff --git a/cmd/gateway/wire_gen.go b/cmd/gateway/wire_gen.go
diff --git a/x/key/repository_test.go b/x/key/repository_test.go
@@ -16,7 +16,10 @@ func TestRepository(t *testing.T) {
 	db, cleanup_db := testutil.CreateDB()
 	defer cleanup_db()
 
-	repo := NewRepository(db)
+    mc, cleanup_mc := testutil.CreateMC()
+    defer cleanup_mc()
+
+	repo := NewRepository(db, mc)
 
 	newkey := core.Key{
 		ID:              "CKb72AAc9dcF088F7088b6718BE5a494fBB3861439",

diff --git a/x/key/service.go b/x/key/service.go
@@ -323,6 +323,7 @@ func (s *service) GetKeyResolution(ctx context.Context, keyID string) ([]core.Ke
 	defer span.End()
 
 	var keys []core.Key
+	var currentDepth = 0
 	for {
 		if IsCCID(keyID) {
 			return keys, nil
@@ -335,6 +336,11 @@ func (s *service) GetKeyResolution(ctx context.Context, keyID string) ([]core.Ke
 
 		keys = append(keys, key)
 		keyID = key.Parent
+
+		currentDepth++
+		if currentDepth >= 8 {
+			return nil, fmt.Errorf("KeyDepth is too deep")
+		}
 	}
 }
 

diff --git a/x/key/service_test.go b/x/key/service_test.go
@@ -33,13 +33,16 @@ func TestService(t *testing.T) {
 	db, cleanup_db := testutil.CreateDB()
 	defer cleanup_db()
 
+    mc, cleanup_mc := testutil.CreateMC()
+    defer cleanup_mc()
+
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	mockEntity := mock_entity.NewMockService(ctrl)
 	mockEntity.EXPECT().ResolveHost(gomock.Any(), gomock.Any(), gomock.Any()).Return("", nil).AnyTimes()
 
-	test_repo := NewRepository(db)
+	test_repo := NewRepository(db, mc)
 	test_service := NewService(test_repo, mockEntity, util.Config{})
 
 	// Test1. 登録してないサブキーで署名されたオブジェクトを検証する

diff --git a/x/stream/mock/service.go b/x/stream/mock/service.go