renames

Author: MaksymMalicki

core/common_state.go

@@ -4,7 +4,6 @@ import (
 	"github.com/NethermindEth/juno/core/felt"
 )
 
-//go:generate mockgen -destination=../mocks/mock_common_state.go -package=mocks github.com/NethermindEth/juno/core CommonState
 type CommonState interface {
 	CommonStateReader
 
@@ -23,6 +22,7 @@ type CommonState interface {
 	Commitment() (felt.Felt, error)
 }
 
+//go:generate mockgen -destination=../mocks/mock_common_state_reader.go -package=mocks github.com/NethermindEth/juno/core CommonStateReader
 type CommonStateReader interface {
 	ContractClassHash(addr *felt.Felt) (felt.Felt, error)
 	ContractNonce(addr *felt.Felt) (felt.Felt, error)

core/common_trie.go

@@ -6,7 +6,6 @@ import (
 )
 
 type CommonTrie interface {
-	Update(key, value *felt.Felt) error
 	Get(key *felt.Felt) (felt.Felt, error)
 	Hash() (felt.Felt, error)
 	HashFn() crypto.HashFn

core/pending_state_test.go

@@ -15,7 +15,7 @@ func TestPendingState(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
 
-	mockState := mocks.NewMockCommonState(mockCtrl)
+	mockState := mocks.NewMockCommonStateReader(mockCtrl)
 
 	deployedAddr := felt.NewRandom[felt.Felt]()
 	deployedAddr2 := felt.NewRandom[felt.Felt]()

core/state/state.go

@@ -51,6 +51,8 @@ type ContractReader interface {
 
 type ClassReader interface {
 	Class(classHash *felt.Felt) (*core.DeclaredClassDefinition, error)
+	CompiledClassHash(classHash *felt.SierraClassHash) (felt.CasmClassHash, error)
+	CompiledClassHashV2(classHash *felt.SierraClassHash) (felt.CasmClassHash, error)
 }
 
 type TrieProvider interface {

mempool/mempool_test.go

@@ -46,7 +46,7 @@ func TestMempool(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
 	chain := mocks.NewMockReader(mockCtrl)
-	state := mocks.NewMockCommonState(mockCtrl)
+	state := mocks.NewMockCommonStateReader(mockCtrl)
 
 	require.NoError(t, err)
 	defer dbCloser()
@@ -121,7 +121,7 @@ func TestRestoreMempool(t *testing.T) {
 	log := utils.NewNopZapLogger()
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
-	state := mocks.NewMockCommonState(mockCtrl)
+	state := mocks.NewMockCommonStateReader(mockCtrl)
 	chain := mocks.NewMockReader(mockCtrl)
 	testDB, dbDeleter, err := setupDatabase("testrestoremempool", true)
 	require.NoError(t, err)
@@ -233,7 +233,7 @@ func TestPopBatch(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
 	chain := mocks.NewMockReader(mockCtrl)
-	state := mocks.NewMockCommonState(mockCtrl)
+	state := mocks.NewMockCommonStateReader(mockCtrl)
 
 	require.NoError(t, err)
 	defer dbCloser()