Merge branch 'feat/darknode-0.3.0' of https://github.com/renproject/l…

…ightnode into feat/darknode-0.3.0
renproject · Sep 23, 2020 · 3a93651 · 3a93651
2 parents b04bdb4 + e2fc7f9
commit 3a93651
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -14,13 +14,11 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-      - name: Set up Go 1.13
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.13
-        id: go
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "^1.14.0"
       - name: Configure git for private modules
         env:
             TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
@@ -30,6 +28,15 @@ jobs:
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-lightnode-${{ hashFiles('**/go.sum') }}
+      - name: Install dependencies
+        run: |
+          sudo apt install ocl-icd-opencl-dev
+          git submodule add https://github.com/filecoin-project/filecoin-ffi.git .extern/filecoin-ffi
+          cd .extern/filecoin-ffi
+          git checkout 777a6fbf4446b1112adfd4fa5dd88e0c88974122
+          make
+          cd ../..
+          go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
       - name: Get dependencies
         run: |
           export PATH=$PATH:$(go env GOPATH)/bin

diff --git a/db/db_test.go b/db/db_test.go
@@ -103,15 +103,13 @@ var _ = Describe("Lightnode db", func() {
 					Expect(CheckTableExistence(dbname, "lock_account_mint_account", sqlDB)).Should(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_utxo", sqlDB)).Should(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_account", sqlDB)).Should(HaveOccurred())
-					Expect(CheckTableExistence(dbname, "burn_account_mint_account", sqlDB)).Should(HaveOccurred())
 
 					// Tables should exist after creation.
 					Expect(db.Init()).To(Succeed())
 					Expect(CheckTableExistence(dbname, "lock_utxo_mint_account", sqlDB)).NotTo(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "lock_account_mint_account", sqlDB)).NotTo(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_utxo", sqlDB)).NotTo(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_account", sqlDB)).NotTo(HaveOccurred())
-					Expect(CheckTableExistence(dbname, "burn_account_mint_account", sqlDB)).NotTo(HaveOccurred())
 
 					// Multiple calls of the creation function should not have
 					// any effect on the existing tables.
@@ -120,7 +118,6 @@ var _ = Describe("Lightnode db", func() {
 					Expect(CheckTableExistence(dbname, "lock_account_mint_account", sqlDB)).NotTo(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_utxo", sqlDB)).NotTo(HaveOccurred())
 					Expect(CheckTableExistence(dbname, "burn_account_release_account", sqlDB)).NotTo(HaveOccurred())
-					Expect(CheckTableExistence(dbname, "burn_account_mint_account", sqlDB)).NotTo(HaveOccurred())
 				})
 			})
 
@@ -200,7 +197,6 @@ var _ = Describe("Lightnode db", func() {
 							Expect(UpdateTxCreatedTime(sqlDB, "lock_account_mint_account", transaction.Hash, time.Now().Unix()-24*3600)).Should(Succeed())
 							Expect(UpdateTxCreatedTime(sqlDB, "burn_account_release_utxo", transaction.Hash, time.Now().Unix()-24*3600)).Should(Succeed())
 							Expect(UpdateTxCreatedTime(sqlDB, "burn_account_release_account", transaction.Hash, time.Now().Unix()-24*3600)).Should(Succeed())
-							Expect(UpdateTxCreatedTime(sqlDB, "burn_account_mint_account", transaction.Hash, time.Now().Unix()-24*3600)).Should(Succeed())
 						}
 						pendingTxs, err := db.PendingTxs(time.Hour)
 						Expect(err).NotTo(HaveOccurred())
@@ -266,16 +262,13 @@ var _ = Describe("Lightnode db", func() {
 						Expect(err).NotTo(HaveOccurred())
 						numBurnAccountReleaseAccount, err := NumOfDataEntries(sqlDB, "burn_account_release_account")
 						Expect(err).NotTo(HaveOccurred())
-						numBurnAccountMintAccount, err := NumOfDataEntries(sqlDB, "burn_account_mint_account")
-						Expect(err).NotTo(HaveOccurred())
-						Expect(numLockUTXOMintAccount + numLockAccountMintAccount + numBurnAccountReleaseUTXO + numBurnAccountMintAccount + numBurnAccountReleaseAccount).Should(Equal(1))
+						Expect(numLockUTXOMintAccount + numLockAccountMintAccount + numBurnAccountReleaseUTXO + numBurnAccountReleaseAccount).Should(Equal(1))
 
 						// Ensure data gets pruned once it has expired.
 						Expect(UpdateTxCreatedTime(sqlDB, "lock_utxo_mint_account", transaction.Hash, time.Now().Unix()-5)).Should(Succeed())
 						Expect(UpdateTxCreatedTime(sqlDB, "lock_account_mint_account", transaction.Hash, time.Now().Unix()-5)).Should(Succeed())
 						Expect(UpdateTxCreatedTime(sqlDB, "burn_account_release_utxo", transaction.Hash, time.Now().Unix()-5)).Should(Succeed())
 						Expect(UpdateTxCreatedTime(sqlDB, "burn_account_release_account", transaction.Hash, time.Now().Unix()-5)).Should(Succeed())
-						Expect(UpdateTxCreatedTime(sqlDB, "burn_account_mint_account", transaction.Hash, time.Now().Unix()-5)).Should(Succeed())
 						Expect(db.Prune(time.Second)).Should(Succeed())
 						numLockUTXOMintAccount, err = NumOfDataEntries(sqlDB, "lock_utxo_mint_account")
 						Expect(err).NotTo(HaveOccurred())
@@ -289,9 +282,6 @@ var _ = Describe("Lightnode db", func() {
 						numBurnAccountReleaseAccount, err = NumOfDataEntries(sqlDB, "burn_account_release_account")
 						Expect(err).NotTo(HaveOccurred())
 						Expect(numBurnAccountReleaseAccount).Should(BeZero())
-						numBurnAccountMintAccount, err = NumOfDataEntries(sqlDB, "burn_account_mint_account")
-						Expect(err).NotTo(HaveOccurred())
-						Expect(numBurnAccountMintAccount).Should(BeZero())
 
 						return true
 					}