Merge branch 'issues-971' of https://github.com/icehawk-hyb/plugin into issues-971

go.sum

@@ -82,6 +82,7 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=

plugin/consensus/tendermint/state.go

@@ -440,7 +440,7 @@ func LoadProposer(source *tmtypes.Validator) (*ttypes.Validator, error) {
 
 // CreateBlockInfoTx make blockInfo to the first transaction of the block and execer is valnode
 func CreateBlockInfoTx(pubkey string, state *tmtypes.State, block *tmtypes.TendermintBlock) *types.Transaction {
-	
+
 	blockSave := *block
 	blockSave.Data = nil
 	blockInfo := &tmtypes.TendermintBlockInfo{

plugin/dapp/dposvote/commands/vote_test.go

@@ -351,7 +351,7 @@ func NormPut(cfg *types.Chain33Config) {
 }
 
 func prepareTxList(cfg *types.Chain33Config) *types.Transaction {
-	
+
 	var key string
 	var value string
 	var i int

plugin/dapp/hashlock/executor/hashlock_unit_test.go

@@ -126,7 +126,6 @@ func constructHashlockInstance() drivers.Driver {
 }
 
 func ConstructLockTx() *types.Transaction {
-	
 
 	var lockAmount int64 = 90
 	var locktime int64 = 70