DEV-1074: fix gRPC error, update tests

config.yml

@@ -1,3 +1,4 @@
 networks: 
-    mainnet: https://rpc.cheqd.net:443
-    testnet: https://api.testnet.cheqd.network:443
+    mainnet: rpc.cheqd.net:443
+    testnet: 127.0.0.1:9090
+    # testnet: api.testnet.cheqd.network:443

main.go

@@ -53,9 +53,10 @@ func main() {
 		responseBody, err := requestService.ProcessDIDRequest(did, resolutionOption)
 		status := http.StatusOK
 		if err != "" {
+			// todo: defined a correct status
 			status = http.StatusBadRequest
 		}
-		return c.String(status, responseBody)
+		return c.JSONBlob(status, []byte(responseBody))
 		//opt := resolver.ResolutionOption{Accept: accept}
 		//rr := resolver.ResolveRepresentation(conn, did, opt)
 		//

services/diddoc_service.go

@@ -75,11 +75,7 @@ func (ds DIDDocService) prepareJWKPubkey(didDoc cheqd.Did) ([]map[string]interfa
 			return nil, err
 		}
 		if len(value.PublicKeyJwk) > 0 {
-			keyJson, err := cheqd.PubKeyJWKToJson(value.PublicKeyJwk)
-			if err != nil {
-				return nil, err
-			}
-			methodJson[publicKeyJwk] = keyJson
+			methodJson[publicKeyJwk] = cheqd.PubKeyJWKToMap(value.PublicKeyJwk)
 		}
 		verMethodList = append(verMethodList, methodJson)
 

services/diddoc_service_test.go

@@ -19,13 +19,24 @@ func TestMarshallDID(t *testing.T) {
 		Controller:         "did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue",
 		PublicKeyMultibase: "zAKJP3f7BD6W4iWEQ9jwndVTCBq8ua2Utt8EEjJ6Vxsf",
 	}
+
+	verificationMethod2 := cheqd.VerificationMethod{
+		Id:         "did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue#verkey",
+		Type:       "JsonWebKey2020",
+		Controller: "did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue",
+		PublicKeyJwk: []*cheqd.KeyValuePair{
+			{"kty", "OKP"},
+			{"crv", "Ed25519"},
+			{"x", "VCpo2LMLhn6iWku8MKvSLg2ZAoC-nlOyPVQaO3FxVeQ"},
+		},
+	}
 	didDoc := cheqd.Did{
 		Context:            []string{"test"},
 		Id:                 "did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue",
-		VerificationMethod: []*cheqd.VerificationMethod{&verificationMethod1},
+		VerificationMethod: []*cheqd.VerificationMethod{&verificationMethod1, &verificationMethod2},
 	}
 
-	expectedDID := "{\"@context\":[\"test\"],\"id\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue\",\"verificationMethod\":[{\"controller\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue\",\"id\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue#verkey\",\"publicKeyMultibase\":\"zAKJP3f7BD6W4iWEQ9jwndVTCBq8ua2Utt8EEjJ6Vxsf\",\"type\":\"Ed25519VerificationKey2020\"}]}"
+	expectedDID := "{\"@context\":[\"test\"],\"id\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue\",\"verificationMethod\":[{\"controller\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue\",\"id\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue#verkey\",\"publicKeyMultibase\":\"zAKJP3f7BD6W4iWEQ9jwndVTCBq8ua2Utt8EEjJ6Vxsf\",\"type\":\"Ed25519VerificationKey2020\"},{\"controller\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue\",\"id\":\"did:cheqd:mainnet:N22KY2Dyvmuu2PyyqSFKue#verkey\",\"publicKeyJwk\":{\"crv\":\"Ed25519\",\"kty\":\"OKP\",\"x\":\"VCpo2LMLhn6iWku8MKvSLg2ZAoC-nlOyPVQaO3FxVeQ\"},\"type\":\"JsonWebKey2020\"}]}"
 
 	jsonDID, err := didDocService.MarshallDID(didDoc)
 

services/ledger_service.go

@@ -63,16 +63,13 @@ func openGRPCConnection(addr string) (conn *grpc.ClientConn, err error) {
 		grpc.WithInsecure(),
 		grpc.WithBlock(),
 	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	ctx, cancel = context.WithDeadline(ctx, <-time.After(5*time.Second))
+	// TODO: move to application setup
+	// TODO: move timeouts to a config
+	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
-	// if cancel != nil {
-	// 	cancel()
-	// 	println("openGRPCConnection: cancel")
-	// 	return nil, errors.New("gRPC connection haven't opened")
-	// }
+
 	conn, err = grpc.DialContext(ctx, addr, opts...)
+
 	if err != nil {
 		println("openGRPCConnection: context failed")
 		println(err.Error())