chore: improve code after code review

0xPolygonID · Nov 2, 2023 · 9059f87 · 9059f87
1 parent 7aca6c3
commit 9059f87
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/.env-issuer.sample b/.env-issuer.sample
@@ -40,8 +40,8 @@ ISSUER_VAULT_USERPASS_AUTH_ENABLED=false
 ISSUER_VAULT_USERPASS_AUTH_PASSWORD=password
 
 
-ISSUER_CREDENTIAL_STATUS_ONCHAIN_TREE_STORE_SUPPORTED_CONTRACT=234152345
+ISSUER_CREDENTIAL_STATUS_ONCHAIN_TREE_STORE_SUPPORTED_CONTRACT=<supported-onchain-revocation-contract>
 ISSUER_CREDENTIAL_STATUS_RHS_URL=http://localhost:3001
 ISSUER_CREDENTIAL_STATUS_PUBLISHING_KEY_PATH=pbkey
 ISSUER_CREDENTIAL_STATUS_RHS_MODE=<None | OffChain | OnChain>
-ISSUER_CREDENTIAL_STATUS_RHS_CHAIN_ID=80001
+ISSUER_CREDENTIAL_STATUS_RHS_CHAIN_ID=<80001 | 137>
diff --git a/cmd/issuer_initializer/main.go b/cmd/issuer_initializer/main.go
@@ -109,9 +109,8 @@ func main() {
 
 	commonClient, err := ethclient.Dial(cfg.Ethereum.URL)
 	if err != nil {
-		log.Info(ctx, "the ethereum rcp is", "url", cfg.Ethereum.URL)
-		log.Error(ctx, "error dialing with ethclient", "err", err)
-		panic("Error dialing with ethclient: " + err.Error())
+		log.Error(ctx, "error dialing with ethclient", "err", err, "rth-url", cfg.Ethereum.URL)
+		return
 	}
 
 	ethConn := eth.NewClient(commonClient, &eth.ClientConfig{

diff --git a/cmd/notifications/main.go b/cmd/notifications/main.go
@@ -96,7 +96,7 @@ func main() {
 	}
 
 	connectionsService := services.NewConnection(connectionsRepository, storage)
-	credentialsService, err := newCredentialsService(cfg, storage, cachex, ps, vaultCli)
+	credentialsService, err := newCredentialsService(ctx, cfg, storage, cachex, ps, vaultCli)
 	if err != nil {
 		log.Error(ctx, "cannot initialize the credential service", "err", err)
 		return
@@ -122,7 +122,7 @@ func main() {
 	<-gracefulShutdown
 }
 
-func newCredentialsService(cfg *config.Configuration, storage *db.Storage, cachex cache.Cache, ps pubsub.Client, vaultCli *vault.Client) (ports.ClaimsService, error) {
+func newCredentialsService(ctx context.Context, cfg *config.Configuration, storage *db.Storage, cachex cache.Cache, ps pubsub.Client, vaultCli *vault.Client) (ports.ClaimsService, error) {
 	identityRepository := repositories.NewIdentity()
 	claimsRepository := repositories.NewClaims()
 	mtRepository := repositories.NewIdentityMerkleTreeRepository()
@@ -135,7 +135,8 @@ func newCredentialsService(cfg *config.Configuration, storage *db.Storage, cache
 
 	commonClient, err := ethclient.Dial(cfg.Ethereum.URL)
 	if err != nil {
-		panic("Error dialing with ethclient: " + err.Error())
+		log.Error(ctx, "error dialing with ethclient", "err", err, "eth-url", cfg.Ethereum.URL)
+		return nil, err
 	}
 
 	ethConn := eth.NewClient(commonClient, &eth.ClientConfig{
@@ -158,7 +159,6 @@ func newCredentialsService(cfg *config.Configuration, storage *db.Storage, cache
 	mtService := services.NewIdentityMerkleTrees(mtRepository)
 	qrService := services.NewQrStoreService(cachex)
 
-	cfg.CredentialStatus.SingleIssuer = true
 	identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, nil, storage, nil, nil, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver)
 	claimsService := services.NewClaim(claimsRepository, identityService, qrService, mtService, identityStateRepository, schemaLoader, storage, cfg.APIUI.ServerURL, ps, cfg.IPFS.GatewayURL, revocationStatusResolver)
 

diff --git a/cmd/pending_publisher/main.go b/cmd/pending_publisher/main.go
@@ -157,7 +157,6 @@ func main() {
 	rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), cl, common.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut)
 	revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus)
 
-	cfg.CredentialStatus.SingleIssuer = true
 	identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver)
 	claimsService := services.NewClaim(claimsRepo, identityService, qrService, mtService, identityStateRepo, schemaLoader, storage, cfg.APIUI.ServerURL, ps, cfg.IPFS.GatewayURL, revocationStatusResolver)
 

diff --git a/internal/common/smart_contract.go b/internal/common/smart_contract.go
@@ -21,14 +21,12 @@ type SmartContractProof struct {
 // SmartContractProofToMtProofAdapter converts SmartContractProof to merkletree.Proof
 func SmartContractProofToMtProofAdapter(smtProof SmartContractProof) (*merkletree.Proof, error) {
 	var (
-		existence bool
-		nodeAux   *merkletree.NodeAux
-		err       error
+		nodeAux *merkletree.NodeAux
+		err     error
 	)
 
-	if smtProof.Existence {
-		existence = true
-	} else {
+	existence := true
+	if !smtProof.Existence {
 		existence = false
 		if smtProof.AuxExistence {
 			nodeAux = &merkletree.NodeAux{}

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -215,7 +215,7 @@ func (c *Configuration) SanitizeAPIUI(ctx context.Context) (err error) {
 }
 
 func (c *Configuration) sanitizeCredentialStatus(_ context.Context, host string) error {
-	if c.CredentialStatus.RHSMode != "" && c.CredentialStatus.RHSMode != onChain && c.CredentialStatus.RHSMode != offChain && c.CredentialStatus.RHSMode != none {
+	if c.CredentialStatus.RHSMode != onChain && c.CredentialStatus.RHSMode != offChain && c.CredentialStatus.RHSMode != none {
 		return fmt.Errorf("ISSUER_CREDENTIAL_STATUS_RHS_MODE value is not valid")
 	}