diff --git a/rpc/contract.go b/rpc/contract.go index bee58571af..a33f84399e 100644 --- a/rpc/contract.go +++ b/rpc/contract.go @@ -44,7 +44,7 @@ func (h *Handler) StorageAt(address, key felt.Felt, id BlockID) (*felt.Felt, *js // This checks if the contract exists because if a key doesn't exist in contract storage, // the returned value is always zero and error is nil. - _, err := stateReader.ContractNonce(&address) + _, err := stateReader.ContractClassHash(&address) if err != nil { if errors.Is(err, db.ErrKeyNotFound) { return nil, ErrContractNotFound diff --git a/rpc/contract_test.go b/rpc/contract_test.go index 4d0ee8c2c8..c9abb5214e 100644 --- a/rpc/contract_test.go +++ b/rpc/contract_test.go @@ -123,8 +123,7 @@ func TestStorageAt(t *testing.T) { t.Run("non-existent contract", func(t *testing.T) { mockReader.EXPECT().HeadState().Return(mockState, nopCloser, nil) - // we check if the contract exists by getting its nonce - mockState.EXPECT().ContractNonce(gomock.Any()).Return(nil, db.ErrKeyNotFound) + mockState.EXPECT().ContractClassHash(gomock.Any()).Return(nil, db.ErrKeyNotFound) storage, rpcErr := handler.StorageAt(felt.Zero, felt.Zero, rpc.BlockID{Latest: true}) require.Nil(t, storage) @@ -133,7 +132,7 @@ func TestStorageAt(t *testing.T) { t.Run("non-existent key", func(t *testing.T) { mockReader.EXPECT().HeadState().Return(mockState, nopCloser, nil) - mockState.EXPECT().ContractNonce(&felt.Zero).Return(nil, nil) + mockState.EXPECT().ContractClassHash(&felt.Zero).Return(nil, nil) mockState.EXPECT().ContractStorage(gomock.Any(), gomock.Any()).Return(nil, db.ErrKeyNotFound) storage, rpcErr := handler.StorageAt(felt.Zero, felt.Zero, rpc.BlockID{Latest: true}) @@ -145,7 +144,7 @@ func TestStorageAt(t *testing.T) { t.Run("blockID - latest", func(t *testing.T) { mockReader.EXPECT().HeadState().Return(mockState, nopCloser, nil) - mockState.EXPECT().ContractNonce(&felt.Zero).Return(nil, nil) + mockState.EXPECT().ContractClassHash(&felt.Zero).Return(nil, nil) mockState.EXPECT().ContractStorage(gomock.Any(), gomock.Any()).Return(expectedStorage, nil) storage, rpcErr := handler.StorageAt(felt.Zero, felt.Zero, rpc.BlockID{Latest: true}) @@ -155,7 +154,7 @@ func TestStorageAt(t *testing.T) { t.Run("blockID - hash", func(t *testing.T) { mockReader.EXPECT().StateAtBlockHash(&felt.Zero).Return(mockState, nopCloser, nil) - mockState.EXPECT().ContractNonce(&felt.Zero).Return(nil, nil) + mockState.EXPECT().ContractClassHash(&felt.Zero).Return(nil, nil) mockState.EXPECT().ContractStorage(gomock.Any(), gomock.Any()).Return(expectedStorage, nil) storage, rpcErr := handler.StorageAt(felt.Zero, felt.Zero, rpc.BlockID{Hash: &felt.Zero}) @@ -165,7 +164,7 @@ func TestStorageAt(t *testing.T) { t.Run("blockID - number", func(t *testing.T) { mockReader.EXPECT().StateAtBlockNumber(uint64(0)).Return(mockState, nopCloser, nil) - mockState.EXPECT().ContractNonce(&felt.Zero).Return(nil, nil) + mockState.EXPECT().ContractClassHash(&felt.Zero).Return(nil, nil) mockState.EXPECT().ContractStorage(gomock.Any(), gomock.Any()).Return(expectedStorage, nil) storage, rpcErr := handler.StorageAt(felt.Zero, felt.Zero, rpc.BlockID{Number: 0})