added skippedblocksmith to snapshot (generate/apply)

common/query/query.go

@@ -62,6 +62,7 @@ func GetSnapshotQuery(ct chaintype.ChainType) (snapshotQuery map[string]Snapshot
 			"pendingTransaction": NewPendingTransactionQuery(),
 			"pendingSignature":   NewPendingSignatureQuery(),
 			"multisignatureInfo": NewMultisignatureInfoQuery(),
+			"skippedBlocksmith":  NewSkippedBlocksmithQuery(),
 		}
 	default:
 		snapshotQuery = map[string]SnapshotQuery{}

common/query/skippedBlocksmithQuery.go

@@ -105,6 +105,7 @@ func (*SkippedBlocksmithQuery) Scan(skippedBlocksmith *model.SkippedBlocksmith,
 	)
 	return err
 }
+
 func (sbq *SkippedBlocksmithQuery) Rollback(height uint32) (multiQueries [][]interface{}) {
 	return [][]interface{}{
 		{
@@ -113,3 +114,15 @@ func (sbq *SkippedBlocksmithQuery) Rollback(height uint32) (multiQueries [][]int
 		},
 	}
 }
+
+func (sbq *SkippedBlocksmithQuery) SelectDataForSnapshot(fromHeight, toHeight uint32) string {
+	return fmt.Sprintf("SELECT %s FROM %s WHERE block_height >= %d AND block_height <= %d ORDER BY block_height",
+		strings.Join(sbq.Fields, ", "),
+		sbq.getTableName(), fromHeight, toHeight)
+}
+
+// TrimDataBeforeSnapshot delete entries to assure there are no duplicates before applying a snapshot
+func (sbq *SkippedBlocksmithQuery) TrimDataBeforeSnapshot(fromHeight, toHeight uint32) string {
+	return fmt.Sprintf(`DELETE FROM %s WHERE block_height >= %d AND block_height <= %d`,
+		sbq.getTableName(), fromHeight, toHeight)
+}

common/query/skippedBlocksmithQuery_test.go

@@ -0,0 +1,98 @@
+package query
+
+import (
+	"testing"
+
+	"github.com/zoobc/zoobc-core/common/chaintype"
+)
+
+func TestSkippedBlocksmithQuery_SelectDataForSnapshot(t *testing.T) {
+	qry := NewSkippedBlocksmithQuery()
+	type fields struct {
+		Fields    []string
+		TableName string
+		ChainType chaintype.ChainType
+	}
+	type args struct {
+		fromHeight uint32
+		toHeight   uint32
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   string
+	}{
+		{
+			name: "SelectDataForSnapshot",
+			fields: fields{
+				Fields:    qry.Fields,
+				TableName: qry.TableName,
+				ChainType: &chaintype.MainChain{},
+			},
+			args: args{
+				fromHeight: 0,
+				toHeight:   10,
+			},
+			want: "SELECT blocksmith_public_key, pop_change, block_height, " +
+				"blocksmith_index FROM skipped_blocksmith WHERE block_height >= 0 AND block_height <= 10 ORDER BY block_height",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			sbq := &SkippedBlocksmithQuery{
+				Fields:    tt.fields.Fields,
+				TableName: tt.fields.TableName,
+				ChainType: tt.fields.ChainType,
+			}
+			if got := sbq.SelectDataForSnapshot(tt.args.fromHeight, tt.args.toHeight); got != tt.want {
+				t.Errorf("SkippedBlocksmithQuery.SelectDataForSnapshot() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSkippedBlocksmithQuery_TrimDataBeforeSnapshot(t *testing.T) {
+	qry := NewSkippedBlocksmithQuery()
+	type fields struct {
+		Fields    []string
+		TableName string
+		ChainType chaintype.ChainType
+	}
+	type args struct {
+		fromHeight uint32
+		toHeight   uint32
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   string
+	}{
+		{
+			name: "TrimDataBeforeSnapshot",
+			fields: fields{
+				Fields:    qry.Fields,
+				TableName: qry.TableName,
+				ChainType: &chaintype.MainChain{},
+			},
+			args: args{
+				fromHeight: 0,
+				toHeight:   10,
+			},
+			want: "DELETE FROM skipped_blocksmith WHERE block_height >= 0 AND block_height <= 10",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			sbq := &SkippedBlocksmithQuery{
+				Fields:    tt.fields.Fields,
+				TableName: tt.fields.TableName,
+				ChainType: tt.fields.ChainType,
+			}
+			if got := sbq.TrimDataBeforeSnapshot(tt.args.fromHeight, tt.args.toHeight); got != tt.want {
+				t.Errorf("SkippedBlocksmithQuery.TrimDataBeforeSnapshot() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

core/service/blockSpineService.go

@@ -878,7 +878,7 @@ func (bs *BlockSpineService) BlockTransactionsRequestedListener() observer.Liste
 func (bs *BlockSpineService) WillSmith(
 	blocksmith *model.Blocksmith,
 	blockchainProcessorLastBlockID int64,
-) (lastBlockId, blocksmithIndex int64, err error) {
+) (lastBlockID, blocksmithIndex int64, err error) {
 	lastBlock, err := bs.GetLastBlock()
 	if err != nil {
 		return blockchainProcessorLastBlockID, blocksmithIndex, blocker.NewBlocker(

core/service/snapshotMainBlockService.go

@@ -27,6 +27,7 @@ type (
 		PendingTransactionQuery    query.PendingTransactionQueryInterface
 		PendingSignatureQuery      query.PendingSignatureQueryInterface
 		MultisignatureInfoQuery    query.MultisignatureInfoQueryInterface
+		SkippedBlocksmithQuery     query.SkippedBlocksmithQueryInterface
 		BlockQuery                 query.BlockQueryInterface
 		SnapshotQueries            map[string]query.SnapshotQuery
 		DerivedQueries             []query.DerivedQuery
@@ -47,6 +48,7 @@ func NewSnapshotMainBlockService(
 	pendingTransactionQuery query.PendingTransactionQueryInterface,
 	pendingSignatureQuery query.PendingSignatureQueryInterface,
 	multisignatureInfoQuery query.MultisignatureInfoQueryInterface,
+	skippedBlocksmithQuery query.SkippedBlocksmithQueryInterface,
 	blockQuery query.BlockQueryInterface,
 	snapshotQueries map[string]query.SnapshotQuery,
 	derivedQueries []query.DerivedQuery,
@@ -66,6 +68,7 @@ func NewSnapshotMainBlockService(
 		PendingTransactionQuery:    pendingTransactionQuery,
 		PendingSignatureQuery:      pendingSignatureQuery,
 		MultisignatureInfoQuery:    multisignatureInfoQuery,
+		SkippedBlocksmithQuery:     skippedBlocksmithQuery,
 		BlockQuery:                 blockQuery,
 		SnapshotQueries:            snapshotQueries,
 		DerivedQueries:             derivedQueries,
@@ -130,6 +133,8 @@ func (ss *SnapshotMainBlockService) NewSnapshotFile(block *model.Block) (snapsho
 				snapshotPayload.PendingSignatures, err = ss.PendingSignatureQuery.BuildModel([]*model.PendingSignature{}, rows)
 			case "multisignatureInfo":
 				snapshotPayload.MultiSignatureInfos, err = ss.MultisignatureInfoQuery.BuildModel([]*model.MultiSignatureInfo{}, rows)
+			case "skippedBlocksmith":
+				snapshotPayload.SkippedBlocksmiths, err = ss.SkippedBlocksmithQuery.BuildModel([]*model.SkippedBlocksmith{}, rows)
 			default:
 				err = blocker.NewBlocker(blocker.ParserErr, fmt.Sprintf("Invalid Snapshot Query Repository: %s", qryRepoName))
 			}
@@ -264,6 +269,14 @@ func (ss *SnapshotMainBlockService) InsertSnapshotPayloadToDB(payload *model.Sna
 				qryArgs := ss.MultisignatureInfoQuery.InsertMultisignatureInfo(rec)
 				queries = append(queries, qryArgs...)
 			}
+		case "skippedBlocksmith":
+			for _, rec := range payload.SkippedBlocksmiths {
+				qry, args := ss.SkippedBlocksmithQuery.InsertSkippedBlocksmith(rec)
+				queries = append(queries,
+					append(
+						[]interface{}{qry}, args...),
+				)
+			}
 		default:
 			return blocker.NewBlocker(blocker.ParserErr, fmt.Sprintf("Invalid Snapshot Query Repository: %s", qryRepoName))
 		}