Merge branch 'development' into dependabot/go_modules/github.com/ethe…

…reum/go-ethereum-1.10.9

.github/CODE_STYLE.md

@@ -0,0 +1,3 @@
+# Code style
+
+🚧 work in progress! 🚧

.github/CONTRIBUTING.md

@@ -14,6 +14,8 @@ The [Polkadot Runtime Specification](https://research.web3.foundation/en/latest/
 
 One important distinction is that we are building the Polkadot Runtime Environment, not Polkadot itself. Given that, although a deep understanding of Polkadot is helpful, it's not critical to contribute to gossamer. To help understand how the Runtime Environment relates to Polkadot, check out this [talk that one of our team members gave at DotCon](https://www.youtube.com/watch?v=nYkbYhM5Yfk).
 
+For coding style, you may refer to the [code style](CODE_STYLE.md) document which we keep up to date with coding style conventions we have for this repository.
+
 ## Contribution Steps
 
 1. **Fork the gossamer repo.**

README.md

@@ -128,7 +128,7 @@ To start the polkadot node:
 
 ## Contribute
 
-- Check out [Contributing Guidelines](.github/CONTRIBUTING.md)  
+- Check out [Contributing Guidelines](.github/CONTRIBUTING.md) and our [code style](.github/CODE_STYLE.md) document
 - Have questions? Say hi on [Discord](https://discord.gg/Xdc5xjE)!
 
 ## Donate

docs/docs/getting-started/overview/package-library.md

@@ -94,10 +94,6 @@ Gossamer packages can be categorized into **four package types**:
 
 - the **runtime package** contains various wasm interpreters used to interpret the runtime. It currently contains `life` and `wasmer`; however, `wasmer` is the only interpreter that is fully supported at the moment. In the future, all interpreters will be fully supported.
 
-#### `lib/scale`
-
-- the **scale package** implements the SCALE codec.
-
 #### `lib/services`
 
 - the **services package** implements a common interface for node services.

dot/core/messages_test.go

@@ -92,7 +92,9 @@ func TestService_HandleBlockProduced(t *testing.T) {
 
 	// simulate block sent from BABE session
 	digest := types.NewDigest()
-	err = digest.Add(*types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest())
+	prd, err := types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest()
+	require.NoError(t, err)
+	err = digest.Add(*prd)
 	require.NoError(t, err)
 
 	newBlock := types.Block{

dot/core/service.go

@@ -552,7 +552,7 @@ func (s *Service) GetMetadata(bhash *common.Hash) ([]byte, error) {
 // QueryStorage returns the key-value data by block based on `keys` params
 // on every block starting `from` until `to` block, if `to` is not nil
 func (s *Service) QueryStorage(from, to common.Hash, keys ...string) (map[common.Hash]QueryKeyValueChanges, error) {
-	if to == common.EmptyHash {
+	if to.IsEmpty() {
 		to = s.blockState.BestBlockHash()
 	}
 
@@ -606,19 +606,20 @@ func (s *Service) tryQueryStorage(block common.Hash, keys ...string) (QueryKeyVa
 
 // GetReadProofAt will return an array with the proofs for the keys passed as params
 // based on the block hash passed as param as well, if block hash is nil then the current state will take place
-func (s *Service) GetReadProofAt(block common.Hash, keys [][]byte) (common.Hash, [][]byte, error) {
-	if common.EmptyHash.Equal(block) {
+func (s *Service) GetReadProofAt(block common.Hash, keys [][]byte) (
+	hash common.Hash, proofForKeys [][]byte, err error) {
+	if block.IsEmpty() {
 		block = s.blockState.BestBlockHash()
 	}
 
 	stateRoot, err := s.blockState.GetBlockStateRoot(block)
 	if err != nil {
-		return common.EmptyHash, nil, err
+		return hash, nil, err
 	}
 
-	proofForKeys, err := s.storageState.GenerateTrieProof(stateRoot, keys)
+	proofForKeys, err = s.storageState.GenerateTrieProof(stateRoot, keys)
 	if err != nil {
-		return common.EmptyHash, nil, err
+		return hash, nil, err
 	}
 
 	return block, proofForKeys, nil

dot/core/service_test.go

@@ -82,7 +82,9 @@ func TestAnnounceBlock(t *testing.T) {
 
 	// simulate block sent from BABE session
 	digest := types.NewDigest()
-	err = digest.Add(*types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest())
+	prd, err := types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest()
+	require.NoError(t, err)
+	err = digest.Add(*prd)
 	require.NoError(t, err)
 
 	newBlock := types.Block{
@@ -815,7 +817,7 @@ func TestGetReadProofAt(t *testing.T) {
 			storageState: mockStorageStage,
 		}
 
-		b, p, err := s.GetReadProofAt(common.EmptyHash, keysToProof)
+		b, p, err := s.GetReadProofAt(common.Hash{}, keysToProof)
 		require.NoError(t, err)
 		require.Equal(t, p, mockedProofs)
 		require.Equal(t, expectedBlockHash, b)
@@ -830,14 +832,14 @@ func TestGetReadProofAt(t *testing.T) {
 
 		mockBlockState := new(mocks.BlockState)
 		mockBlockState.On("GetBlockStateRoot", mockedBlockHash).
-			Return(common.EmptyHash, errors.New("problems while getting state root"))
+			Return(common.Hash{}, errors.New("problems while getting state root"))
 
 		s := &Service{
 			blockState: mockBlockState,
 		}
 
 		b, p, err := s.GetReadProofAt(mockedBlockHash, keysToProof)
-		require.Equal(t, common.EmptyHash, b)
+		require.True(t, b.IsEmpty())
 		require.Nil(t, p)
 		require.Error(t, err)
 	})
@@ -860,7 +862,7 @@ func TestGetReadProofAt(t *testing.T) {
 		}
 
 		b, p, err := s.GetReadProofAt(mockedBlockHash, keysToProof)
-		require.Equal(t, common.EmptyHash, b)
+		require.True(t, b.IsEmpty())
 		require.Nil(t, p)
 		require.Error(t, err)
 	})

dot/digest/digest_test.go

@@ -367,14 +367,19 @@ func TestHandler_HandleBABEOnDisabled(t *testing.T) {
 }
 
 func createHeaderWithPreDigest(t *testing.T, slotNumber uint64) *types.Header {
-	babeHeader := types.NewBabePrimaryPreDigest(0, slotNumber, [32]byte{}, [64]byte{})
+	t.Helper()
 
-	enc := babeHeader.Encode()
+	babeHeader := types.NewBabeDigest()
+	err := babeHeader.Set(*types.NewBabePrimaryPreDigest(0, slotNumber, [32]byte{}, [64]byte{}))
+	require.NoError(t, err)
+
+	enc, err := scale.Marshal(babeHeader)
+	require.NoError(t, err)
 	d := &types.PreRuntimeDigest{
 		Data: enc,
 	}
 	digest := types.NewDigest()
-	err := digest.Add(*d)
+	err = digest.Add(*d)
 	require.NoError(t, err)
 
 	return &types.Header{