mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2025-01-04 08:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sharding: address review comments

Browse Source 
Former-commit-id: 3d5cd49930ff1a07ccb544910e2b4bfeb75f04de [formerly 0275d8ec3ce981aed3ea2f88c660505e809f6b7d]
Former-commit-id: d291b375e7550f8792ece3e982f6b85da862ffed
This commit is contained in:
Raul Jordan 2018-05-15 22:55:02 -04:00
parent b6949f8582
commit 083c93e712
4 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sharding/collation.go
View File

@ -13,6 +13,7 @@ import (
type Collation struct {
header *CollationHeader
// body represents the serialized blob of a collation's transactions.
// this is a read-only property.
body []byte
// transactions serves as a useful slice to store deserialized chunks from the
// collation's body. Every time this transactions slice is updated, the serialized

36
sharding/collation_test.go
View File

@ -39,42 +39,6 @@ func TestCollation_ProposerAddress(t *testing.T) {
}
}
// TODO: this test needs to change as we will be serializing tx's into blobs
// within the collation body instead.
// func TestCollation_AddTransactions(t *testing.T) {
// tests := []struct {
// transactions []*types.Transaction
// }{
// {
// transactions: []*types.Transaction{
// makeTxWithGasLimit(0),
// makeTxWithGasLimit(1),
// makeTxWithGasLimit(2),
// makeTxWithGasLimit(3),
// },
// }, {
// transactions: []*types.Transaction{},
// },
// }
// for _, tt := range tests {
// c := &Collation{}
// for _, tx := range tt.transactions {
// c.AddTransaction(tx)
// }
// results := c.Transactions()
// if len(results) != len(tt.transactions) {
// t.Fatalf("Wrong number of transactions. want=%d. got=%d", len(tt.transactions), len(results))
// }
// for i, tx := range tt.transactions {
// if results[i] != tx {
// t.Fatalf("Mismatched transactions. wanted=%+v. got=%+v", tt.transactions, results)
// }
// }
// }
// }
func makeTxWithGasLimit(gl uint64) *types.Transaction {
return types.NewTransaction(0 /*nonce*/, common.HexToAddress("0x0") /*to*/, nil /*amount*/, gl, nil /*gasPrice*/, nil /*data*/)
}

7
sharding/shard.go
View File

@ -129,7 +129,7 @@ func (s *Shard) BodyByChunkRoot(chunkRoot *common.Hash) ([]byte, error) {
return nil, err
}
if body == nil {
return nil, fmt.Errorf("no corresponding body with chunk root found: %v", chunkRoot.String())
return nil, fmt.Errorf("no corresponding body with chunk root found: %s", chunkRoot)
}
return *body, nil
}
@ -239,10 +239,7 @@ func (s *Shard) SetCanonical(header *CollationHeader) error {
}
// sets the key to be the canonical collation lookup key and val as RLP encoded
// collation header.
if err := s.shardDB.Put(key, encoded); err != nil {
return err
}
return nil
return s.shardDB.Put(key, encoded)
}
// dataAvailabilityLookupKey formats a string that will become a lookup

2
sharding/shard_test.go
View File

@ -192,7 +192,7 @@ func TestShard_CanonicalHeaderHash(t *testing.T) {
}
if canonicalHeaderHash.String() != headerHash.String() {
t.Errorf("header hashes do not match. want=%v. got=%v", headerHash.String(), canonicalHeaderHash.String())
t.Errorf("header hashes do not match. want=%s. got=%s", headerHash.String(), canonicalHeaderHash.String())
}
}