Merge branch 'noot/kusama-block-4939774' of github.com:ChainSafe/goss…

…amer into noot/kusama-block-4939774
ChainSafe · Mar 16, 2021 · e829c5f · e829c5f
2 parents c8efd49 + 6163b3b
commit e829c5f
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,32 @@ jobs:
 
       - name: Run build
         run: make build
+
+  publish-code-coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go-version }}
+      - uses: actions/checkout@v2
+
+      - name: Cache go modules
+        uses: actions/cache@v1
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Generate coverage report
+        run: |
+          go test ./... -short -coverprofile=coverage.out -covermode=atomic -timeout=20m
+      - uses: codecov/codecov-action@v1
+        with:
+          token: "89982880-a53b-4a3a-9bdd-3dc9c78bd190"
+          files: ./coverage.out
+          flags: unit-tests
+          name: coverage
+          verbose: true
 
   docker-build-n-push:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -61,9 +61,9 @@ jobs:
           with:
             token: "89982880-a53b-4a3a-9bdd-3dc9c78bd190"
             files: ./coverage.out
-            flags: unittests
+            flags: unit-tests
             name: coverage
-            verbose: trues
+            verbose: true
 
   docker-stable-tests:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -15,12 +15,8 @@
     <img alt="go report card" src="https://goreportcard.com/badge/github.com/ChainSafe/gossamer?style=for-the-badge" height="20" />
   </a>
 </div>
-<div align="center">
-  <a href="https://codeclimate.com/github/ChainSafe/gossamer/badges">
-    <img alt="maintainability" src="https://img.shields.io/codeclimate/maintainability/ChainSafe/gossamer?style=for-the-badge" height="20" />
-  </a>
-  <a href="https://codeclimate.com/github/ChainSafe/gossamer/test_coverage">
-    <img alt="Test Coverage" src="https://img.shields.io/codeclimate/coverage/ChainSafe/gossamer?style=for-the-badge" height="20" />
+  <a href="https://app.codecov.io/gh/ChainSafe/gossamer">
+    <img alt="Test Coverage" src="https://img.shields.io/codecov/c/github/ChainSafe/gossamer?flag=unittests&style=for-the-badge&token=89982880-a53b-4a3a-9bdd-3dc9c78bd190" height="20" />
   </a>
     <a href="https://discord.gg/zy8eRF7FG2">
     <img alt="Discord" src="https://img.shields.io/discord/593655374469660673.svg?style=for-the-badge&label=Discord&logo=discord" height="20"/>
@@ -29,7 +25,7 @@
     <img alt="Gossamer Blog" src="https://img.shields.io/badge/Medium-grey?style=for-the-badge&logo=medium" height="20" />
   </a>
     <a href="https://medium.com/chainsafe-systems/tagged/polkadot">
-    <img alt="Gossamer Blog" src="https://img.shields.io/twitter/follow/chainsafeth?color=blue&label=follow&logo=twitter&style=for-the-badge" height="20"/>
+    <img alt="Twitter" src="https://img.shields.io/twitter/follow/chainsafeth?color=blue&label=follow&logo=twitter&style=for-the-badge" height="20"/>
   </a>
 </div>
 <br />

diff --git a/lib/trie/trie.go b/lib/trie/trie.go
@@ -166,6 +166,10 @@ func (t *Trie) nextKey(curr node, prefix, key []byte) []byte {
 		fullKey := append(prefix, c.key...)
 		var cmp int
 		if len(key) < len(fullKey) {
+			if bytes.Compare(key, fullKey[:len(key)]) == 1 { // arg key is greater than full, return nil
+				return nil
+			}
+
 			// the key is lexicographically less than the current node key. return first key available
 			cmp = 1
 		} else {
@@ -209,6 +213,10 @@ func (t *Trie) nextKey(curr node, prefix, key []byte) []byte {
 		fullKey := append(prefix, c.key...)
 		var cmp int
 		if len(key) < len(fullKey) {
+			if bytes.Compare(key, fullKey[:len(key)]) == 1 { // arg key is greater than full, return nil
+				return nil
+			}
+
 			// the key is lexicographically less than the current node key. return first key available
 			cmp = 1
 		} else {

diff --git a/lib/trie/trie_test.go b/lib/trie/trie_test.go
@@ -739,6 +739,26 @@ func TestNextKey_Again(t *testing.T) {
 	}
 }
 
+func TestNextKey_HostAPI(t *testing.T) {
+	trie := NewEmptyTrie()
+
+	var testCases = []string{
+		":code",
+		":heappages",
+	}
+
+	for _, tc := range testCases {
+		trie.Put([]byte(tc), []byte(tc))
+	}
+
+	nextCases := []string{"Opti", "Option"}
+
+	for _, tc := range nextCases {
+		next := trie.NextKey([]byte(tc))
+		require.Nil(t, next)
+	}
+}
+
 func TestClearPrefix(t *testing.T) {
 	tests := []Test{
 		{key: []byte{0x01, 0x35}, value: []byte("spaghetti"), op: PUT},