github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 07:58:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use config DepositContractTreeDepth (#6708)

Browse Source
This commit is contained in:
terence tsao
2020-07-23 21:30:28 -07:00
committed by GitHub
parent dfdff37a3e
commit 403dab43f5
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
beacon-chain/cache/depositcache/pending_deposits_test.go vendored
View File

@@ -9,6 +9,7 @@ import (
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
)
@@ -30,9 +31,9 @@ func TestInsertPendingDeposit_ignoresNilDeposit(t *testing.T) {
func TestRemovePendingDeposit_OK(t *testing.T) {
db := DepositCache{}
proof1 := make([][]byte, 33)
proof1 := make([][]byte, int(params.BeaconConfig().DepositContractTreeDepth)+1)
proof1[0] = bytesutil.PadTo([]byte{'A'}, 32)
proof2 := make([][]byte, 33)
proof2 := make([][]byte, int(params.BeaconConfig().DepositContractTreeDepth)+1)
proof2[0] = bytesutil.PadTo([]byte{'A'}, 32)
depToRemove := &ethpb.Deposit{Proof: proof1}
otherDep := &ethpb.Deposit{Proof: proof2}
@@ -56,7 +57,7 @@ func TestRemovePendingDeposit_IgnoresNilDeposit(t *testing.T) {
func TestPendingDeposit_RoundTrip(t *testing.T) {
dc := DepositCache{}
proof := make([][]byte, 33)
proof := make([][]byte, int(params.BeaconConfig().DepositContractTreeDepth)+1)
proof[0] = bytesutil.PadTo([]byte{'A'}, 32)
dep := &ethpb.Deposit{Proof: proof}
dc.InsertPendingDeposit(context.Background(), dep, 111, 100, [32]byte{})

24
shared/trieutil/sparse_merkle_test.go
View File

@@ -23,7 +23,7 @@ func TestMarshalDepositWithProof(t *testing.T) {
[]byte("FFFFFF"),
[]byte("GGGGGGG"),
}
m, err := GenerateTrieFromItems(items, 32)
m, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
t.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -31,7 +31,7 @@ func TestMarshalDepositWithProof(t *testing.T) {
if err != nil {
t.Fatalf("Could not generate Merkle proof: %v", err)
}
if len(proof) != 33 {
if len(proof) != int(params.BeaconConfig().DepositContractTreeDepth)+1 {
t.Errorf("Received len %d, wanted 33", len(proof))
}
someRoot := [32]byte{1, 2, 3, 4}
@@ -100,7 +100,7 @@ func TestMerkleTrieRoot_EmptyTrie(t *testing.T) {
}
func TestGenerateTrieFromItems_NoItemsProvided(t *testing.T) {
if _, err := GenerateTrieFromItems(nil, 32); err == nil {
if _, err := GenerateTrieFromItems(nil, int(params.BeaconConfig().DepositContractTreeDepth)); err == nil {
t.Error("Expected error when providing nil items received nil")
}
}
@@ -116,7 +116,7 @@ func TestMerkleTrie_VerifyMerkleProof(t *testing.T) {
[]byte("G"),
[]byte("H"),
}
m, err := GenerateTrieFromItems(items, 32)
m, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
t.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -124,7 +124,7 @@ func TestMerkleTrie_VerifyMerkleProof(t *testing.T) {
if err != nil {
t.Fatalf("Could not generate Merkle proof: %v", err)
}
if len(proof) != 33 {
if len(proof) != int(params.BeaconConfig().DepositContractTreeDepth)+1 {
t.Errorf("Received len %d, wanted 33", len(proof))
}
root := m.Root()
@@ -150,7 +150,7 @@ func TestMerkleTrie_VerifyMerkleProof_TrieUpdated(t *testing.T) {
{3},
{4},
}
m, err := GenerateTrieFromItems(items, 33)
m, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth)+1)
if err != nil {
t.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -188,7 +188,7 @@ func TestRoundtripProto_OK(t *testing.T) {
{3},
{4},
}
m, err := GenerateTrieFromItems(items, 33)
m, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth)+1)
if err != nil {
t.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -209,7 +209,7 @@ func TestCopy_OK(t *testing.T) {
{3},
{4},
}
source, err := GenerateTrieFromItems(items, 33)
source, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth)+1)
if err != nil {
t.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -237,7 +237,7 @@ func BenchmarkGenerateTrieFromItems(b *testing.B) {
[]byte("GGGGGGG"),
}
for i := 0; i < b.N; i++ {
if _, err := GenerateTrieFromItems(items, 32); err != nil {
if _, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth)); err != nil {
b.Fatalf("Could not generate Merkle trie from items: %v", err)
}
}
@@ -251,7 +251,7 @@ func BenchmarkInsertTrie_Optimized(b *testing.B) {
someRoot := bytesutil.ToBytes32([]byte(strconv.Itoa(i)))
items[i] = someRoot[:]
}
tr, err := GenerateTrieFromItems(items, 32)
tr, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
b.Fatalf("Could not generate Merkle trie from items: %v", err)
}
@@ -273,7 +273,7 @@ func BenchmarkGenerateProof(b *testing.B) {
[]byte("FFFFFF"),
[]byte("GGGGGGG"),
}
normalTrie, err := GenerateTrieFromItems(items, 32)
normalTrie, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
b.Fatal(err)
}
@@ -296,7 +296,7 @@ func BenchmarkVerifyMerkleBranch(b *testing.B) {
[]byte("FFFFFF"),
[]byte("GGGGGGG"),
}
m, err := GenerateTrieFromItems(items, 32)
m, err := GenerateTrieFromItems(items, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
b.Fatalf("Could not generate Merkle trie from items: %v", err)
}