remove copy of types containing mutex

client/consensus/grandpa/aux_schema.go

@@ -84,13 +84,11 @@ func loadPersistent[H comparable, N constraints.Unsigned, ID AuthorityID, Sig Au
 			}
 		}
 
-		newSharedVoterSetState := sharedVoterSetState[H, N, ID, Sig]{
-			Inner: setState,
-		}
-
 		return &persistentData[H, N, ID, Sig]{
 			authoritySet: SharedAuthoritySet[H, N, ID]{inner: *authSet},
-			setState:     SharedVoterSetState[H, N, ID, Sig]{Inner: newSharedVoterSetState}, //nolint
+			setState: SharedVoterSetState[H, N, ID, Sig]{Inner: sharedVoterSetState[H, N, ID, Sig]{
+				Inner: setState,
+			}},
 		}, nil
 	}
 
@@ -125,13 +123,11 @@ func loadPersistent[H comparable, N constraints.Unsigned, ID AuthorityID, Sig Au
 		return nil, err
 	}
 
-	newSharedVoterSetState := sharedVoterSetState[H, N, ID, Sig]{
-		Inner: genesisState,
-	}
-
 	return &persistentData[H, N, ID, Sig]{
 		authoritySet: SharedAuthoritySet[H, N, ID]{inner: *genesisSet},
-		setState:     SharedVoterSetState[H, N, ID, Sig]{Inner: newSharedVoterSetState}, //nolint
+		setState: SharedVoterSetState[H, N, ID, Sig]{Inner: sharedVoterSetState[H, N, ID, Sig]{
+			Inner: genesisState,
+		}},
 	}, nil
 }
 

client/consensus/grandpa/finality_proof.go

@@ -109,13 +109,12 @@ func (provider FinalityProofProvider[BE, Hash, N, AuthID, S, ID, H, B]) proveFin
 		return nil, nil
 	}
 
-	// TODO address lock copy
-	authoritySetChanges := *provider.sharedAuthoritySet //nolint
 	return proveFinality[BE, Hash, N, S, ID, H, B](
 		provider.backend,
-		authoritySetChanges.inner.AuthoritySetChanges,
+		provider.sharedAuthoritySet.inner.AuthoritySetChanges,
 		block,
-		collectUnknownHeaders)
+		collectUnknownHeaders,
+	)
 }
 
 // FinalityProof Finality for block B is proved by providing:

client/consensus/grandpa/finality_proof_test.go

@@ -18,11 +18,11 @@ import (
 // Returns the vector of headers that MUST be validated + imported
 // AND if at least one of those headers is invalid, all other MUST be considered invalid.
 func checkFinalityProof[
-Hash constraints.Ordered,
-N constraints.Unsigned,
-S comparable,
-H Header[Hash, N],
-ID AuthorityID,
+	Hash constraints.Ordered,
+	N constraints.Unsigned,
+	S comparable,
+	H Header[Hash, N],
+	ID AuthorityID,
 ](
 	t *testing.T,
 	currentSetID uint64,
@@ -415,7 +415,7 @@ func TestFinalityProof_InLastSetFailsWithoutLatest(t *testing.T) {
 	// the best stored justification, for which there is none in this case.
 	authoritySetChanges := AuthoritySetChanges[uint]{}
 	authoritySetChanges.append(0, 5)
-	
+
 	proof, err := proveFinality[
 		*BackendMock[string, uint, testHeader[string, uint],
 			*BlockchainBackendMock[string, uint, testHeader[string, uint]]],

client/consensus/grandpa/justification.go

@@ -20,7 +20,7 @@ var (
 	errBlockNotDescendentOfBase = errors.New("block not descendent of base")
 )
 
-// Justification is a GRANDPA justification for block finality, it includes a commit message and
+// GrandpaJustification is a GRANDPA justification for block finality, it includes a commit message and
 // an ancestry proof including all headers routing all precommit target blocks
 // to the commit target block. Due to the current voting strategy the precommit
 // targets should be the same as the commit target, since honest voters don't