services: untie verifyIncompleteWitnesses from Notary service

Signed-off-by: Anna Shaleva <[email protected]>

Author: AnnaShaleva

pkg/services/notary/notary.go

@@ -246,7 +246,7 @@ func (n *Notary) OnNewRequest(payload *payload.P2PNotaryRequest) {
 
 	nvbFallback := payload.FallbackTransaction.GetAttributes(transaction.NotValidBeforeT)[0].Value.(*transaction.NotValidBefore).Height
 	nKeys := payload.MainTransaction.GetAttributes(transaction.NotaryAssistedT)[0].Value.(*transaction.NotaryAssisted).NKeys
-	newInfo, validationErr := n.verifyIncompleteWitnesses(payload.MainTransaction, nKeys)
+	newInfo, validationErr := verifyIncompleteWitnesses(payload.MainTransaction, nKeys)
 	if validationErr != nil {
 		n.Config.Log.Info("verification of main notary transaction failed; fallback transaction will be completed",
 			zap.String("main hash", payload.MainTransaction.Hash().StringLE()),
@@ -508,7 +508,7 @@ func updateTxSize(tx *transaction.Transaction) (*transaction.Transaction, error)
 // verifyIncompleteWitnesses checks that the tx either doesn't have all witnesses attached (in this case none of them
 // can be multisignature) or it only has a partial multisignature. It returns the request type (sig/multisig), the
 // number of signatures to be collected, sorted public keys (for multisig request only) and an error.
-func (n *Notary) verifyIncompleteWitnesses(tx *transaction.Transaction, nKeysExpected uint8) ([]witnessInfo, error) {
+func verifyIncompleteWitnesses(tx *transaction.Transaction, nKeysExpected uint8) ([]witnessInfo, error) {
 	var nKeysActual uint8
 	if len(tx.Signers) < 2 {
 		return nil, errors.New("transaction should have at least 2 signers")

pkg/services/notary/notary_test.go

@@ -47,9 +47,7 @@ func TestWallet(t *testing.T) {
 }
 
 func TestVerifyIncompleteRequest(t *testing.T) {
-	bc := fakechain.NewFakeChain()
 	notaryContractHash := nativehashes.Notary
-	_, ntr, _ := getTestNotary(t, bc, "./testdata/notary1.json", "one")
 	sig := append([]byte{byte(opcode.PUSHDATA1), keys.SignatureLen}, make([]byte, keys.SignatureLen)...) // we're not interested in signature correctness
 	acc1, _ := keys.NewPrivateKey()
 	acc2, _ := keys.NewPrivateKey()
@@ -65,7 +63,7 @@ func TestVerifyIncompleteRequest(t *testing.T) {
 	multisigScriptHash2 := hash.Hash160(multisigScript2)
 
 	checkErr := func(t *testing.T, tx *transaction.Transaction, nKeys uint8) {
-		witnessInfo, err := ntr.verifyIncompleteWitnesses(tx, nKeys)
+		witnessInfo, err := verifyIncompleteWitnesses(tx, nKeys)
 		require.Error(t, err)
 		require.Nil(t, witnessInfo)
 	}
@@ -475,7 +473,7 @@ func TestVerifyIncompleteRequest(t *testing.T) {
 
 	for name, testCase := range testCases {
 		t.Run(name, func(t *testing.T) {
-			actualInfo, err := ntr.verifyIncompleteWitnesses(testCase.tx, testCase.nKeys)
+			actualInfo, err := verifyIncompleteWitnesses(testCase.tx, testCase.nKeys)
 			require.NoError(t, err)
 			require.Equal(t, len(testCase.expectedInfo), len(actualInfo))
 			for i, expected := range testCase.expectedInfo {