Merge branch 'make-permissionless' of https://github.com/bazo-blockchain/bazo-client into make-permissionless

Author: rmnblm

network/incoming.go

@@ -13,7 +13,7 @@ var (
 	BlockChan             = make(chan interface{})
 	BlockHeaderChan       = make(chan interface{})
 	FundsTxChan           = make(chan interface{})
-	ContractTxChan             = make(chan interface{})
+	ContractTxChan        = make(chan interface{})
 	ConfigTxChan          = make(chan interface{})
 	StakeTxChan           = make(chan interface{})
 	AccChan               = make(chan interface{})
@@ -38,8 +38,8 @@ func processIncomingMsg(p *peer, header *p2p.Header, payload []byte) {
 		blockHeaderRes(p, payload)
 	case p2p.FUNDSTX_RES:
 		txRes(p, payload, p2p.FUNDSTX_RES)
-	case p2p.ACCTX_RES:
-		txRes(p, payload, p2p.ACCTX_RES)
+	case p2p.CONTRACTTX_RES:
+		txRes(p, payload, p2p.CONTRACTTX_RES)
 	case p2p.CONFIGTX_RES:
 		txRes(p, payload, p2p.CONFIGTX_RES)
 	case p2p.STAKETX_RES:

network/responses.go

@@ -38,7 +38,7 @@ func txRes(p *peer, payload []byte, txType uint8) {
 			return
 		}
 		FundsTxChan <- fundsTx
-	case p2p.ACCTX_RES:
+	case p2p.CONTRACTTX_RES:
 		var contractTx *protocol.ContractTx
 		contractTx = contractTx.Decode(payload)
 		if contractTx == nil {