uint32(time.Now().Unix()) wrapped

ubclaunchpad · Jul 13, 2017 · 06cb4a9 · 06cb4a9
1 parent fd911d0
commit 06cb4a9
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/blockchain/block_test.go b/blockchain/block_test.go
@@ -3,7 +3,8 @@ package blockchain
 import (
 	"bytes"
 	"testing"
-	"time"
+
+	"github.com/ubclaunchpad/cumulus/common"
 )
 
 func TestEncodeDecodeBlock(t *testing.T) {
@@ -32,7 +33,7 @@ func TestBlockHeaderLen(t *testing.T) {
 		0,
 		NewTestHash(),
 		NewValidTestTarget(),
-		uint32(time.Now().Unix()),
+		common.UnixNow(),
 		0,
 		[]byte{0x00, 0x01, 0x02},
 	}
@@ -47,7 +48,7 @@ func TestBlockHeaderLen(t *testing.T) {
 		0,
 		NewTestHash(),
 		NewValidTestTarget(),
-		uint32(time.Now().Unix()),
+		common.UnixNow(),
 		0,
 		[]byte{},
 	}

diff --git a/blockchain/genesis.go b/blockchain/genesis.go
@@ -1,8 +1,6 @@
 package blockchain
 
-import (
-	"time"
-)
+import "github.com/ubclaunchpad/cumulus/common"
 
 // Genesis creates the Genesis block and returns is.
 //
@@ -36,7 +34,7 @@ func Genesis(miner Address, target Hash, blockReward uint64, extraData []byte) *
 			BlockNumber: 0,
 			LastBlock:   NilHash,
 			Target:      target,
-			Time:        uint32(time.Now().Unix()),
+			Time:        common.UnixNow(),
 			Nonce:       0,
 			ExtraData:   extraData,
 		},

diff --git a/blockchain/test_utils.go b/blockchain/test_utils.go
@@ -7,6 +7,7 @@ import (
 	mrand "math/rand"
 	"time"
 
+	"github.com/ubclaunchpad/cumulus/common"
 	c "github.com/ubclaunchpad/cumulus/common/constants"
 	"github.com/ubclaunchpad/cumulus/common/math"
 )
@@ -102,7 +103,7 @@ func NewTestInputBlock(t []*Transaction) *Block {
 			BlockNumber: 0,
 			LastBlock:   NewTestHash(),
 			Target:      NewValidTestTarget(),
-			Time:        uint32(time.Now().Unix()),
+			Time:        common.UnixNow(),
 			Nonce:       0,
 		},
 		Transactions: t,
@@ -117,7 +118,7 @@ func NewTestOutputBlock(t []*Transaction, input *Block) *Block {
 			BlockNumber: input.BlockNumber + 1,
 			LastBlock:   HashSum(input),
 			Target:      NewValidTestTarget(),
-			Time:        uint32(time.Now().Unix()),
+			Time:        common.UnixNow(),
 			Nonce:       0,
 		},
 		Transactions: t,

diff --git a/common/time.go b/common/time.go
@@ -0,0 +1,9 @@
+package common
+
+import "time"
+
+// UnixNow returns the current Unix time as a uint32. This represents the number
+// of seconds elapsed since January 1, 1970 UTC.
+func UnixNow() uint32 {
+	return uint32(time.Now().Unix())
+}
diff --git a/consensus/consensus_test.go b/consensus/consensus_test.go
@@ -2,11 +2,11 @@ package consensus
 
 import (
 	"testing"
-	"time"
 
 	"math/rand"
 
 	"github.com/ubclaunchpad/cumulus/blockchain"
+	"github.com/ubclaunchpad/cumulus/common"
 	c "github.com/ubclaunchpad/cumulus/common/constants"
 )
 
@@ -154,7 +154,7 @@ func newValidBlockChainAndCloudBaseBlock() (
 			BlockNumber: bcSize,
 			LastBlock:   blockchain.HashSum(bc.Blocks[bcSize-1]),
 			Target:      CurrentTarget(),
-			Time:        uint32(time.Now().Unix()),
+			Time:        common.UnixNow(),
 			Nonce:       0,
 		},
 		Transactions: make([]*blockchain.Transaction, 1),

diff --git a/miner/miner.go b/miner/miner.go
@@ -3,10 +3,10 @@ package miner
 import (
 	"math"
 	"sync"
-	"time"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/ubclaunchpad/cumulus/blockchain"
+	"github.com/ubclaunchpad/cumulus/common"
 	"github.com/ubclaunchpad/cumulus/consensus"
 )
 
@@ -65,7 +65,7 @@ func Mine(bc *blockchain.BlockChain, b *blockchain.Block) *MiningResult {
 		}
 
 		// Timestamp and increase the nonce.
-		b.Time = uint32(time.Now().Unix())
+		b.Time = common.UnixNow()
 		b.Nonce++
 	}
 

diff --git a/miner/miner_test.go b/miner/miner_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/ubclaunchpad/cumulus/blockchain"
+	"github.com/ubclaunchpad/cumulus/common"
 	c "github.com/ubclaunchpad/cumulus/common/constants"
 	"github.com/ubclaunchpad/cumulus/consensus"
 )
@@ -21,7 +22,7 @@ func TestMine(t *testing.T) {
 	// Set target to be as easy as possible so that we find a hash
 	// below the target straight away (2**256 - 1)
 	b.Target = blockchain.BigIntToHash(blockchain.MaxTarget)
-	b.Time = uint32(time.Now().Unix())
+	b.Time = common.UnixNow()
 	mineResult := Mine(bc, b)
 	blockchain.MaxTarget = tempMaxTarget
 
@@ -42,7 +43,7 @@ func TestMineHaltMiner(t *testing.T) {
 
 	// Set target to be as hard as possible so that we stall.
 	b.Target = blockchain.BigIntToHash(blockchain.MinTarget)
-	b.Time = uint32(time.Now().Unix())
+	b.Time = common.UnixNow()
 
 	// Use a thread to stop the miner a few moments after starting.
 	go func() {
@@ -66,7 +67,7 @@ func TestCloudBase(t *testing.T) {
 			BlockNumber: bcSize,
 			LastBlock:   blockchain.HashSum(bc.Blocks[bcSize-1]),
 			Target:      consensus.CurrentTarget(),
-			Time:        uint32(time.Now().Unix()),
+			Time:        common.UnixNow(),
 			Nonce:       0,
 		},
 		Transactions: make([]*blockchain.Transaction, 0),