core: modify interface (#194)

* Add a new method to notify full node about round cutting.
* Modify interface to return error when preparing block

2 files changed, 9 insertions, 4 deletions

diff --git a/simulation/app.go b/simulation/app.go
index 0e3e184..0ca65c9 100644
--- a/simulation/app.go
+++ b/simulation/app.go
@@ -98,18 +98,18 @@ func (a *simApp) getAckedBlocks(ackHash common.Hash) (output common.Hashes) {
 }
 
 // PreparePayload implements core.Application.
-func (a *simApp) PreparePayload(position types.Position) []byte {
-	return []byte{}
+func (a *simApp) PreparePayload(position types.Position) ([]byte, error) {
+	return []byte{}, nil
 }
 
 // PrepareWitness implements core.Application.
-func (a *simApp) PrepareWitness(height uint64) types.Witness {
+func (a *simApp) PrepareWitness(height uint64) (types.Witness, error) {
 	a.latestWitnessReady.L.Lock()
 	defer a.latestWitnessReady.L.Unlock()
 	for a.latestWitness.Height < height {
 		a.latestWitnessReady.Wait()
 	}
-	return a.latestWitness
+	return a.latestWitness, nil
 }
 
 // StronglyAcked is called when a block is strongly acked by DEXON
diff --git a/simulation/governance.go b/simulation/governance.go
index 2b0f56b..0a2c886 100644
--- a/simulation/governance.go
+++ b/simulation/governance.go
@@ -114,6 +114,11 @@ func (g *simGovernance) CRS(round uint64) common.Hash {
 	return g.crs[round]
 }
 
+// NotifyRoundHeight notifies governance contract to snapshot configuration
+// for that round with the block on that consensus height.
+func (g *simGovernance) NotifyRoundHeight(round, height uint64) {
+}
+
 // ProposeCRS proposes a CRS of round.
 func (g *simGovernance) ProposeCRS(signedCRS []byte) {
 	crs := crypto.Keccak256Hash(signedCRS)