Merge branch 'dev' into 114-emoji-town

blockchain/genesis_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestGenesis(t *testing.T) {
 	miner := NewWallet()
-	currentTarget := BigIntToHash(MaxTarget)
+	currentTarget := BigIntToHash(c.MaxTarget)
 	currentBlockReward := uint64(25)
 	gb := Genesis(miner.Public(), currentTarget, currentBlockReward, []byte{})
 
@@ -31,9 +31,4 @@ func TestGenesis(t *testing.T) {
 	if len(gb.Transactions) != 1 {
 		t.Fail()
 	}
-
-	// Check if the transaction is a valid cloud base transaction
-	if valid, _ := ValidCloudBase(gb.Transactions[0]); !valid {
-		t.Fail()
-	}
 }

blockchain/test_utils.go

@@ -5,7 +5,6 @@ import (
 	"crypto/sha256"
 	"math/big"
 	mrand "math/rand"
-	"time"
 
 	c "github.com/ubclaunchpad/cumulus/common/constants"
 	"github.com/ubclaunchpad/cumulus/common/util"
@@ -205,12 +204,12 @@ func NewValidTestChainAndBlock() (*BlockChain, *Block) {
 // NewValidTestTarget creates a new valid target that is a random value between the
 // max and min difficulties
 func NewValidTestTarget() Hash {
-	r := new(big.Int).Rand(
-		mrand.New(mrand.NewSource(time.Now().Unix())),
-		util.BigAdd(MaxTarget, c.Big1),
+	return BigIntToHash(
+		new(big.Int).Div(
+			c.MaxTarget,
+			c.MinTarget,
+		),
 	)
-	r.Add(r, c.Big1)
-	return BigIntToHash(r)
 }
 
 // NewValidCloudBaseTestTransaction returns a new valid CloudBase transaction and