Skip to content

Commit 374fcf7

Browse files
MaksymMalickiMaksymMalicki
committed
minor linter changes
1 parent ddded14 commit 374fcf7

File tree

7 files changed

+72
-79
lines changed

7 files changed

+72
-79
lines changed

‎blockchain/blockchain.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ func storeCasmHashMetadata(
483483
return storeCasmHashMetadataV2(reader, writer, blockNumber, stateUpdate)
484484
}
485485

486-
return storeCasmHashMetadataV1(reader, writer, blockNumber, stateUpdate, newClasses)
486+
return storeCasmHashMetadataV1(writer, blockNumber, stateUpdate, newClasses)
487487
}
488488

489489
// storeCasmHashMetadataV2 stores metadata for classes declared with casm hash v2 or
@@ -536,7 +536,6 @@ func storeCasmHashMetadataV2(
536536
// storeDeclaredV1Classes stores metadata for classes declared with V1 hash (protocol < 0.14.1).
537537
// It computes the V2 hash from the class definition.
538538
func storeCasmHashMetadataV1(
539-
reader db.KeyValueReader,
540539
writer db.KeyValueWriter,
541540
blockNumber uint64,
542541
stateUpdate *core.StateUpdate,

‎core/state/state.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func New(stateRoot *felt.Felt, db *StateDB) (*State, error) {
9292

9393
func (s *State) ContractClassHash(addr *felt.Felt) (felt.Felt, error) {
9494
// todo: remove felt cast
95-
if classHash := s.db.stateCache.getReplacedClass((*felt.Felt)(&s.initRoot), addr); classHash != nil {
95+
if classHash := s.db.stateCache.getReplacedClass(&s.initRoot, addr); classHash != nil {
9696
return *classHash, nil
9797
}
9898

@@ -105,7 +105,7 @@ func (s *State) ContractClassHash(addr *felt.Felt) (felt.Felt, error) {
105105

106106
func (s *State) ContractNonce(addr *felt.Felt) (felt.Felt, error) {
107107
// todo: remove felt cast
108-
if nonce := s.db.stateCache.getNonce((*felt.Felt)(&s.initRoot), addr); nonce != nil {
108+
if nonce := s.db.stateCache.getNonce(&s.initRoot, addr); nonce != nil {
109109
return *nonce, nil
110110
}
111111

@@ -117,7 +117,7 @@ func (s *State) ContractNonce(addr *felt.Felt) (felt.Felt, error) {
117117
}
118118

119119
func (s *State) ContractStorage(addr, key *felt.Felt) (felt.Felt, error) {
120-
if storage := s.db.stateCache.getStorageDiff((*felt.Felt)(&s.initRoot), addr, key); storage != nil {
120+
if storage := s.db.stateCache.getStorageDiff(&s.initRoot, addr, key); storage != nil {
121121
return *storage, nil
122122
}
123123

‎rpc/v8/storage.go‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -250,28 +250,24 @@ func getContractProof(
250250
}
251251
}
252252

253-
func getContractProofWithDeprecatedTrie(
254-
tr *trie.Trie,
253+
func buildContractLeavesData(
255254
state core.CommonStateReader,
256255
contracts []felt.Felt,
257-
) (*ContractProof, error) {
258-
contractProof := trie.NewProofNodeSet()
256+
getRoot func() (felt.Felt, error),
257+
contractNotFoundErr error,
258+
) ([]*LeafData, error) {
259259
contractLeavesData := make([]*LeafData, len(contracts))
260260

261261
for i, contract := range contracts {
262-
if err := tr.Prove(&contract, contractProof); err != nil {
263-
return nil, err
264-
}
265-
266-
root, err := tr.Hash()
262+
root, err := getRoot()
267263
if err != nil {
268264
return nil, err
269265
}
270266

271267
nonce, err := state.ContractNonce(&contract)
272268
if err != nil {
273269
// contract does not exist, skip getting leaf data
274-
if errors.Is(err, db.ErrKeyNotFound) {
270+
if errors.Is(err, contractNotFoundErr) {
275271
continue
276272
}
277273
return nil, err
@@ -289,6 +285,27 @@ func getContractProofWithDeprecatedTrie(
289285
}
290286
}
291287

288+
return contractLeavesData, nil
289+
}
290+
291+
func getContractProofWithDeprecatedTrie(
292+
tr *trie.Trie,
293+
state core.CommonStateReader,
294+
contracts []felt.Felt,
295+
) (*ContractProof, error) {
296+
contractProof := trie.NewProofNodeSet()
297+
298+
for _, contract := range contracts {
299+
if err := tr.Prove(&contract, contractProof); err != nil {
300+
return nil, err
301+
}
302+
}
303+
304+
contractLeavesData, err := buildContractLeavesData(state, contracts, tr.Hash, db.ErrKeyNotFound)
305+
if err != nil {
306+
return nil, err
307+
}
308+
292309
return &ContractProof{
293310
Nodes: adaptDeprecatedTrieProofNodes(contractProof),
294311
LeavesData: contractLeavesData,
@@ -301,36 +318,16 @@ func getContractProofWithTrie(
301318
contracts []felt.Felt,
302319
) (*ContractProof, error) {
303320
contractProof := trie2.NewProofNodeSet()
304-
contractLeavesData := make([]*LeafData, len(contracts))
305-
for i, contract := range contracts {
306-
if err := tr.Prove(&contract, contractProof); err != nil {
307-
return nil, err
308-
}
309321

310-
root, err := tr.Hash()
311-
if err != nil {
312-
return nil, err
313-
}
314-
315-
nonce, err := st.ContractNonce(&contract)
316-
if err != nil {
317-
// contract does not exist, skip getting leaf data
318-
if errors.Is(err, state.ErrContractNotDeployed) {
319-
continue
320-
}
321-
return nil, err
322-
}
323-
324-
classHash, err := st.ContractClassHash(&contract)
325-
if err != nil {
322+
for _, contract := range contracts {
323+
if err := tr.Prove(&contract, contractProof); err != nil {
326324
return nil, err
327325
}
326+
}
328327

329-
contractLeavesData[i] = &LeafData{
330-
Nonce: &nonce,
331-
ClassHash: &classHash,
332-
StorageRoot: &root,
333-
}
328+
contractLeavesData, err := buildContractLeavesData(st, contracts, tr.Hash, state.ErrContractNotDeployed)
329+
if err != nil {
330+
return nil, err
334331
}
335332

336333
return &ContractProof{

‎rpc/v8/subscriptions_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/NethermindEth/juno/clients/feeder"
1616
"github.com/NethermindEth/juno/core"
1717
"github.com/NethermindEth/juno/core/felt"
18-
1918
statetestutils "github.com/NethermindEth/juno/core/state/statetestutils"
2019
"github.com/NethermindEth/juno/db"
2120
"github.com/NethermindEth/juno/db/memory"

‎rpc/v9/storage.go‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -254,27 +254,24 @@ func getContractProof(
254254
}
255255
}
256256

257-
func getContractProofWithDeprecatedTrie(
258-
tr *trie.Trie,
257+
func buildContractLeavesData(
259258
state core.CommonStateReader,
260259
contracts []felt.Felt,
261-
) (*ContractProof, error) {
262-
contractProof := trie.NewProofNodeSet()
260+
getRoot func() (felt.Felt, error),
261+
contractNotFoundErr error,
262+
) ([]*LeafData, error) {
263263
contractLeavesData := make([]*LeafData, len(contracts))
264264

265265
for i, contract := range contracts {
266-
if err := tr.Prove(&contract, contractProof); err != nil {
267-
return nil, err
268-
}
269-
270-
root, err := tr.Hash()
266+
root, err := getRoot()
271267
if err != nil {
272268
return nil, err
273269
}
274270

275271
nonce, err := state.ContractNonce(&contract)
276272
if err != nil {
277-
if errors.Is(err, db.ErrKeyNotFound) { // contract does not exist, skip getting leaf data
273+
// contract does not exist, skip getting leaf data
274+
if errors.Is(err, contractNotFoundErr) {
278275
continue
279276
}
280277
return nil, err
@@ -292,6 +289,27 @@ func getContractProofWithDeprecatedTrie(
292289
}
293290
}
294291

292+
return contractLeavesData, nil
293+
}
294+
295+
func getContractProofWithDeprecatedTrie(
296+
tr *trie.Trie,
297+
state core.CommonStateReader,
298+
contracts []felt.Felt,
299+
) (*ContractProof, error) {
300+
contractProof := trie.NewProofNodeSet()
301+
302+
for _, contract := range contracts {
303+
if err := tr.Prove(&contract, contractProof); err != nil {
304+
return nil, err
305+
}
306+
}
307+
308+
contractLeavesData, err := buildContractLeavesData(state, contracts, tr.Hash, db.ErrKeyNotFound)
309+
if err != nil {
310+
return nil, err
311+
}
312+
295313
return &ContractProof{
296314
Nodes: adaptDeprecatedTrieProofNodes(contractProof),
297315
LeavesData: contractLeavesData,
@@ -304,37 +322,16 @@ func getContractProofWithTrie(
304322
contracts []felt.Felt,
305323
) (*ContractProof, error) {
306324
contractProof := trie2.NewProofNodeSet()
307-
contractLeavesData := make([]*LeafData, len(contracts))
308325

309-
for i, contract := range contracts {
326+
for _, contract := range contracts {
310327
if err := tr.Prove(&contract, contractProof); err != nil {
311328
return nil, err
312329
}
330+
}
313331

314-
root, err := tr.Hash()
315-
if err != nil {
316-
return nil, err
317-
}
318-
319-
nonce, err := st.ContractNonce(&contract)
320-
if err != nil {
321-
// contract does not exist, skip getting leaf data
322-
if errors.Is(err, state.ErrContractNotDeployed) {
323-
continue
324-
}
325-
return nil, err
326-
}
327-
328-
classHash, err := st.ContractClassHash(&contract)
329-
if err != nil {
330-
return nil, err
331-
}
332-
333-
contractLeavesData[i] = &LeafData{
334-
Nonce: &nonce,
335-
ClassHash: &classHash,
336-
StorageRoot: &root,
337-
}
332+
contractLeavesData, err := buildContractLeavesData(st, contracts, tr.Hash, state.ErrContractNotDeployed)
333+
if err != nil {
334+
return nil, err
338335
}
339336

340337
return &ContractProof{

‎rpc/v9/subscriptions_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/NethermindEth/juno/clients/feeder"
1515
"github.com/NethermindEth/juno/core"
1616
"github.com/NethermindEth/juno/core/felt"
17-
1817
statetestutils "github.com/NethermindEth/juno/core/state/statetestutils"
1918
"github.com/NethermindEth/juno/db"
2019
"github.com/NethermindEth/juno/db/memory"

‎vm/vm_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ func TestCallCairo(t *testing.T) {
192192
stateFactory, err := statefactory.NewStateFactory(statetestutils.UseNewState(), triedb, stateDB)
193193
require.NoError(t, err)
194194
state, err := stateFactory.NewState(&felt.Zero, txn)
195+
require.NoError(t, err)
196+
195197
newRoot := felt.NewUnsafeFromString[felt.Felt](
196198
"0x2650cef46c190ec6bb7dc21a5a36781132e7c883b27175e625031149d4f1a84",
197199
)

0 commit comments

Comments
 (0)