fix(privval): jrpc server update broke build

dashpay · Jun 27, 2024 · d6e1e50 · d6e1e50
1 parent 6f7eff3
commit d6e1e50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/privval/dash_core_mock_signer_server.go b/privval/dash_core_mock_signer_server.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/dashpay/tenderdash/crypto"
 	"github.com/dashpay/tenderdash/types"
+	"github.com/dashpay/tenderdash/version"
 )
 
 type DashCoreMockSignerServer struct {
@@ -23,13 +24,10 @@ func NewDashCoreMockSignerServer(
 	privVal types.PrivValidator,
 ) *DashCoreMockSignerServer {
 	// create plugin (jrpc server)
+	jrpcServer := jrpc.NewServer("/command", jrpc.Auth("user", "password"),
+		jrpc.WithSignature("dashcoremock", "dashpay", version.TMCoreSemVer))
 	mockServer := &DashCoreMockSignerServer{
-		server: &jrpc.Server{
-			API:        "/command",     // base url for rpc calls
-			AuthUser:   "user",         // basic auth user name
-			AuthPasswd: "password",     // basic auth password
-			AppName:    "dashcoremock", // plugin name for headers
-		},
+		server:     jrpcServer,
 		chainID:    chainID,
 		quorumHash: quorumHash,
 		privVal:    privVal,

diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go
@@ -46,10 +46,6 @@ func DefaultValidationRequestHandler(
 
 		var proTxHash crypto.ProTxHash
 		proTxHash, err = privVal.GetProTxHash(context.Background())
-		if err != nil {
-			return res, err
-		}
-
 		if err != nil {
 			res = mustWrapMsg(&privvalproto.ProTxHashResponse{
 				ProTxHash: nil, Error: &privvalproto.RemoteSignerError{Code: 0, Description: err.Error()}})