Merge pull request #225 from ellcrys/dev

Smarter Chain Re-organisation

Author: ncodes

.circleci/config.yml

@@ -0,0 +1,17 @@
+dist: xenial
+language: go
+go:
+- 1.12.4
+before_install:
+- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+- go get github.com/onsi/ginkgo/ginkgo
+install:
+- dep ensure -v
+script:
+- ginkgo -v -race ./...
+cache:
+  directories:
+  - vendor
+notifications:
+  slack:
+    secure: a/JzDKjun3yXPLhxLFzgeE7EmbbS+Mo//BRsjsUHzMzhtzlkBnx+cwDjCKEl81k69eKCbgM7+zYL0q7p5CtlQH8maz6f/akB+rl+xSSV/cmRKKQeCH+Ht9q7qr8nkW0q7UaomK8bWml3ODTl9iEOfxUt6gJK3uufXEFJ8dMtbU73IEitUDFNfSnXHt1hBMjbfNu52aFcbzwDJciYdNN5n6uw2kd0fXSIbWfOwjqUJGQvzH5zFmE8M6yQ6f9U45RqBmNAA7rWkOK0qDTiA0d/DnAytLrWVMe+PT78/gfMpXXqMilooEOV7RLufOZjAsnAQDxrVuuRdmnBwRnHHe9I+uabW+1iFkDXwppztpmx54FO5+r6pePbQlNkOWuAkGjj7KXm3kEKAvh13uI/7lYbUur/jVIe8g/MOnWhm48c39vfaSnyq3teHzbYVfePYbzzNHDMG604o/AurXFOUNLkN1GzcREg7pzFSatcATkShubu2DmAncxPGC33M0Ci6CzbcpuCb8KciUX/x2PGyy5pOmo4nEX5N9pFneQV/ggpvEEShh9LQOkVWoWOftwV/5j/NsLmolOkxMoomh/niGsb1GQUr/jLmwFZ8ppNI0fQGeiMWW2Ov0vjQ+dFvAiOU9GxKEEWKtegrLaxGubSm1i7XtUvCMdro7cb3UB1ObNL8S8=

.travis.yml

@@ -145,10 +145,6 @@
   branch = "master"
   name = "github.com/ncodes/go-prettyjson"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/ncodes/whereami"
-
 [[constraint]]
   branch = "master"
   name = "github.com/olebedev/emitter"

Gopkg.lock

@@ -2,7 +2,7 @@
 
 # Elld - Official Ellcrys Client
 [![GoDoc](https://godoc.org/github.com/ellcrys/elld?status.svg)](https://godoc.org/github.com/ellcrys/elld)
-[![CircleCI](https://circleci.com/gh/ellcrys/elld/tree/master.svg?style=svg)](https://circleci.com/gh/ellcrys/elld/tree/master)
+[![Build Status](https://travis-ci.org/ellcrys/elld.svg?branch=master)](https://travis-ci.org/ellcrys/elld)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/ellnet)
 [![Go Report Card](https://goreportcard.com/badge/github.com/ellcrys/elld)](https://goreportcard.com/report/github.com/ellcrys/elld)
 

Gopkg.toml

@@ -8,8 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ellcrys/elld/util/activeobject"
-
 	"github.com/ellcrys/elld/crypto"
 	"github.com/syndtr/goleveldb/leveldb"
 
@@ -35,6 +33,11 @@ const (
 	MaxRejectedBlocksCacheSize = 100
 )
 
+var (
+	// GenesisBlockFileName is the name of the file that contains the genesis block
+	GenesisBlockFileName = "genesis.json"
+)
+
 // Blockchain represents the Ellcrys blockchain. It provides
 // functionalities for interacting with the underlying database
 // and primitives.
@@ -76,9 +79,11 @@ type Blockchain struct {
 	// events or broadcast events about its state
 	eventEmitter *emitter.Emitter
 
-	// activeObj provides active object pattern for handling
-	// function calls
-	activeObj *activeobject.ActiveObject
+	// skipDecideBestChain skips the operation to decide which chain is the best
+	// when a block is processed.
+	// Note: Used to prevent re-organisation when creating
+	// and assembling blocks into desired chains in integration test.
+	skipDecideBestChain bool
 
 	// chl is a lock for chain events
 	chl *sync.RWMutex
@@ -111,7 +116,6 @@ func New(txPool types.TxPool, cfg *config.EngineConfig, log logger.Logger) *Bloc
 	bc.orphanBlocks = cache.NewCache(MaxOrphanBlocksCacheSize)
 	bc.rejectedBlocks = cache.NewCache(MaxRejectedBlocksCacheSize)
 	bc.eventEmitter = &emitter.Emitter{}
-	bc.activeObj = activeobject.NewActiveObject()
 	return bc
 }
 
@@ -176,7 +180,7 @@ func (b *Blockchain) Up() error {
 	// been set, we attempt to load it from the
 	// genesis.json file.
 	if b.genesisBlock == nil {
-		b.genesisBlock, err = LoadBlockFromFile("genesis.json")
+		b.genesisBlock, err = LoadBlockFromFile(GenesisBlockFileName)
 		if err != nil {
 			return err
 		}
@@ -222,6 +226,9 @@ func (b *Blockchain) Up() error {
 		b.log.Info("Known branches have been loaded", "NumBranches", numChains)
 	}
 
+	// Set the root chain and make it the initial main chain
+	b.bestChain = b.getRootChain()
+
 	// Using the best chain rule, we mush select the best chain
 	// and set it as the current bestChain.
 	err = b.decideBestChain()
@@ -232,6 +239,19 @@ func (b *Blockchain) Up() error {
 	return nil
 }
 
+// getRootChain finds the root chain of the tree.
+// This is usually the main chain and it has no branch.
+func (b *Blockchain) getRootChain() *Chain {
+	b.chl.RLock()
+	defer b.chl.RUnlock()
+	for _, c := range b.chains {
+		if !c.HasParent() {
+			return c
+		}
+	}
+	return nil
+}
+
 // getBlockByHash finds and returns a block by hash only
 // SetEventEmitter sets the event emitter
 func (b *Blockchain) SetEventEmitter(ee *emitter.Emitter) {