Skip to content

Commit

Permalink
FAB-1128 finalize protos - remove api and devops
Browse files Browse the repository at this point in the history 
https://jira.hyperledger.org/browse/FAB-1128

This changeset takes closer to final protos
   . remove protos for devops and api
   . remove Message and related structures
   . copies needed function from devops into
     peer/chaincode
   . with gossip support
      . peer no longer is a chat server
      . peer no longer provides discovery
      . peer no longer syncs

Change-Id: I72a4dfff8e3325b44da4123ad2e137cf97bccb82
Signed-off-by: Srinivasan Muralidharan <muralisr@us.ibm.com>
  • Loading branch information
Srinivasan Muralidharan committed Nov 21, 2016
1 parent 8ae8147 commit 0bd607a
Show file tree
Hide file tree
Showing 41 changed files with 319 additions and 6,398 deletions.
258 changes: 12 additions & 246 deletions core/devops.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,78 +19,42 @@ package core
import (
"errors"
"fmt"
"strings"

"github.com/op/go-logging"
"github.com/spf13/viper"
"golang.org/x/net/context"

"encoding/asn1"
"encoding/base64"
"sync"

"github.com/hyperledger/fabric/core/chaincode"
"github.com/hyperledger/fabric/core/chaincode/platforms"
"github.com/hyperledger/fabric/core/container"
crypto "github.com/hyperledger/fabric/core/crypto"
"github.com/hyperledger/fabric/core/peer"
"github.com/hyperledger/fabric/core/util"
pb "github.com/hyperledger/fabric/protos/peer"
)

var devopsLogger = logging.MustGetLogger("devops")

// NewDevopsServer creates and returns a new Devops server instance.
func NewDevopsServer(coord peer.MessageHandlerCoordinator) *Devops {
func NewDevopsServer() *Devops {
d := new(Devops)
d.coord = coord
d.isSecurityEnabled = viper.GetBool("security.enabled")
d.bindingMap = &bindingMap{m: make(map[string]crypto.TransactionHandler)}
return d
}

// bindingMap Used to store map of binding to TransactionHandler
type bindingMap struct {
sync.RWMutex
m map[string]crypto.TransactionHandler
}

// Devops implementation of Devops services
type Devops struct {
coord peer.MessageHandlerCoordinator
isSecurityEnabled bool
bindingMap *bindingMap
}

func (b *bindingMap) getKeyFromBinding(binding []byte) string {
return base64.StdEncoding.EncodeToString(binding)
}

func (b *bindingMap) addBinding(bindingToAdd []byte, txHandler crypto.TransactionHandler) {
b.Lock()
defer b.Unlock()
key := b.getKeyFromBinding(bindingToAdd)
b.m[key] = txHandler
}

func (b *bindingMap) getTxHandlerForBinding(binding []byte) (crypto.TransactionHandler, error) {
b.Lock()
defer b.Unlock()
key := b.getKeyFromBinding(binding)
txHandler, ok := b.m[key]
if ok != true {
// TXhandler not found by key, return error
return nil, fmt.Errorf("Transaction handler not found for binding key = %s", key)
// checkSpec to see if chaincode resides within current package capture for language.
func checkSpec(spec *pb.ChaincodeSpec) error {
// Don't allow nil value
if spec == nil {
return errors.New("Expected chaincode specification, nil received")
}
return txHandler, nil
}

// Login establishes the security context with the Devops service
func (d *Devops) Login(ctx context.Context, secret *pb.Secret) (*pb.Response, error) {

return &pb.Response{Status: pb.Response_FAILURE, Msg: []byte("login command has been removed")}, nil
platform, err := platforms.Find(spec.Type)
if err != nil {
return fmt.Errorf("Failed to determine platform type: %s", err)
}

// TODO: Handle timeout and expiration
return platform.ValidateSpec(spec)
}

// Build builds the supplied chaincode image
Expand All @@ -99,7 +63,7 @@ func (*Devops) Build(context context.Context, spec *pb.ChaincodeSpec) (*pb.Chain
var codePackageBytes []byte
if mode != chaincode.DevModeUserRunsChaincode {
devopsLogger.Debugf("Received build request for chaincode spec: %v", spec)
if err := CheckSpec(spec); err != nil {
if err := checkSpec(spec); err != nil {
return nil, err
}

Expand All @@ -117,201 +81,3 @@ func (*Devops) Build(context context.Context, spec *pb.ChaincodeSpec) (*pb.Chain
chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec, CodePackage: codePackageBytes}
return chaincodeDeploymentSpec, nil
}

// GetChaincodeBytes get chaincode deployment spec given the chaincode spec
func GetChaincodeBytes(context context.Context, spec *pb.ChaincodeSpec) (*pb.ChaincodeDeploymentSpec, error) {
mode := viper.GetString("chaincode.mode")
var codePackageBytes []byte
if mode != chaincode.DevModeUserRunsChaincode {
devopsLogger.Debugf("Received build request for chaincode spec: %v", spec)
var err error
if err = CheckSpec(spec); err != nil {
return nil, err
}

codePackageBytes, err = container.GetChaincodePackageBytes(spec)
if err != nil {
err = fmt.Errorf("Error getting chaincode package bytes: %s", err)
devopsLogger.Error(fmt.Sprintf("%s", err))
return nil, err
}
}
chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec, CodePackage: codePackageBytes}
return chaincodeDeploymentSpec, nil
}

// Deploy deploys the supplied chaincode image to the validators through a transaction
func (d *Devops) Deploy(ctx context.Context, spec *pb.ChaincodeSpec) (*pb.ChaincodeDeploymentSpec, error) {
// get the deployment spec
chaincodeDeploymentSpec, err := GetChaincodeBytes(ctx, spec)

if err != nil {
devopsLogger.Error(fmt.Sprintf("Error deploying chaincode spec: %v\n\n error: %s", spec, err))
return nil, err
}

// Now create the Transactions message and send to Peer.

transID := chaincodeDeploymentSpec.ChaincodeSpec.ChaincodeID.Name

var tx *pb.Transaction

if devopsLogger.IsEnabledFor(logging.DEBUG) {
devopsLogger.Debugf("Creating deployment transaction (%s)", transID)
}
tx, err = pb.NewChaincodeDeployTransaction(chaincodeDeploymentSpec, transID)
if err != nil {
return nil, fmt.Errorf("Error deploying chaincode: %s ", err)
}

if devopsLogger.IsEnabledFor(logging.DEBUG) {
devopsLogger.Debugf("Sending deploy transaction (%s) to validator", tx.Txid)
}
resp := d.coord.ExecuteTransaction(tx)
if resp.Status == pb.Response_FAILURE {
err = errors.New(string(resp.Msg))
}

return chaincodeDeploymentSpec, err
}

func (d *Devops) invokeOrQuery(ctx context.Context, chaincodeInvocationSpec *pb.ChaincodeInvocationSpec, attributes []string, invoke bool) (*pb.Response, error) {

if chaincodeInvocationSpec.ChaincodeSpec.ChaincodeID.Name == "" {
return nil, errors.New("name not given for invoke/query")
}

// Now create the Transactions message and send to Peer.
var customIDgenAlg = strings.ToLower(chaincodeInvocationSpec.IdGenerationAlg)
var id string
var generr error
if invoke {
if customIDgenAlg != "" {
ctorbytes, merr := asn1.Marshal(*chaincodeInvocationSpec.ChaincodeSpec.CtorMsg)
if merr != nil {
return nil, fmt.Errorf("Error marshalling constructor: %s", merr)
}
id, generr = util.GenerateIDWithAlg(customIDgenAlg, ctorbytes)
if generr != nil {
return nil, generr
}
} else {
id = util.GenerateUUID()
}
} else {
id = util.GenerateUUID()
}
devopsLogger.Infof("Transaction ID: %v", id)
var transaction *pb.Transaction
var err error
var sec crypto.Client

transaction, err = d.createExecTx(chaincodeInvocationSpec, attributes, id, invoke, sec)
if err != nil {
return nil, err
}
devopsLogger.Debugf("Sending invocation transaction (%s) to validator", transaction.Txid)
resp := d.coord.ExecuteTransaction(transaction)
if resp.Status == pb.Response_FAILURE {
err = errors.New(string(resp.Msg))
} else {
if !invoke && nil != sec && viper.GetBool("security.privacy") {
if resp.Msg, err = sec.DecryptQueryResult(transaction, resp.Msg); nil != err {
devopsLogger.Errorf("Failed decrypting query transaction result %s", string(resp.Msg[:]))
//resp = &pb.Response{Status: pb.Response_FAILURE, Msg: []byte(err.Error())}
}
}
}
return resp, err
}

func (d *Devops) createExecTx(spec *pb.ChaincodeInvocationSpec, attributes []string, uuid string, invokeTx bool, sec crypto.Client) (*pb.Transaction, error) {
var tx *pb.Transaction
var err error

//TODO What should we do with the attributes
if nil != sec {
if devopsLogger.IsEnabledFor(logging.DEBUG) {
devopsLogger.Debugf("Creating secure invocation transaction %s", uuid)
}
if invokeTx {
tx, err = sec.NewChaincodeExecute(spec, uuid, attributes...)
} else {
tx, err = sec.NewChaincodeQuery(spec, uuid, attributes...)
}
if nil != err {
return nil, err
}
} else {
if devopsLogger.IsEnabledFor(logging.DEBUG) {
devopsLogger.Debugf("Creating invocation transaction (%s)", uuid)
}
var t pb.Transaction_Type
if invokeTx {
t = pb.Transaction_CHAINCODE_INVOKE
} else {
t = pb.Transaction_CHAINCODE_QUERY
}
tx, err = pb.NewChaincodeExecute(spec, uuid, t)
if nil != err {
return nil, err
}
}
return tx, nil
}

// Invoke performs the supplied invocation on the specified chaincode through a transaction
func (d *Devops) Invoke(ctx context.Context, chaincodeInvocationSpec *pb.ChaincodeInvocationSpec) (*pb.Response, error) {
return d.invokeOrQuery(ctx, chaincodeInvocationSpec, chaincodeInvocationSpec.ChaincodeSpec.Attributes, true)
}

// Query performs the supplied query on the specified chaincode through a transaction
func (d *Devops) Query(ctx context.Context, chaincodeInvocationSpec *pb.ChaincodeInvocationSpec) (*pb.Response, error) {
return d.invokeOrQuery(ctx, chaincodeInvocationSpec, chaincodeInvocationSpec.ChaincodeSpec.Attributes, false)
}

// CheckSpec to see if chaincode resides within current package capture for language.
func CheckSpec(spec *pb.ChaincodeSpec) error {
// Don't allow nil value
if spec == nil {
return errors.New("Expected chaincode specification, nil received")
}

platform, err := platforms.Find(spec.Type)
if err != nil {
return fmt.Errorf("Failed to determine platform type: %s", err)
}

return platform.ValidateSpec(spec)
}

// EXP_GetApplicationTCert retrieves an application TCert for the supplied user
func (d *Devops) EXP_GetApplicationTCert(ctx context.Context, secret *pb.Secret) (*pb.Response, error) {

devopsLogger.Warning("GetApplicationTCert no longer supported")
return &pb.Response{Status: pb.Response_FAILURE, Msg: []byte("no longer supported")}, nil
// TODO: Handle timeout and expiration
}

// EXP_PrepareForTx prepares a binding/TXHandler pair to be used in subsequent TX
func (d *Devops) EXP_PrepareForTx(ctx context.Context, secret *pb.Secret) (*pb.Response, error) {

devopsLogger.Warning("PrepareForTx no longer supported")
return &pb.Response{Status: pb.Response_FAILURE, Msg: []byte("no longer supported")}, nil
// TODO: Handle timeout and expiration
}

// EXP_ProduceSigma produces a sigma as []byte and returns in response
func (d *Devops) EXP_ProduceSigma(ctx context.Context, sigmaInput *pb.SigmaInput) (*pb.Response, error) {

devopsLogger.Warning("ProduceSigma no longer supported")
return &pb.Response{Status: pb.Response_FAILURE, Msg: []byte("no longer supported")}, nil

}

// EXP_ExecuteWithBinding executes a transaction with a specific binding/TXHandler
func (d *Devops) EXP_ExecuteWithBinding(ctx context.Context, executeWithBinding *pb.ExecuteWithBinding) (*pb.Response, error) {

devopsLogger.Warning("ExecuteWithBinding no longer supported")
return &pb.Response{Status: pb.Response_FAILURE, Msg: []byte("no longer supported")}, nil
}
41 changes: 2 additions & 39 deletions core/devops_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
func TestDevops_Build_NilSpec(t *testing.T) {
t.Skip("Skipping until we have the Validator system setup properly for testing.")
// TODO Cannot pass in nil to NewDevopsServer
devopsServer := NewDevopsServer(nil)
devopsServer := NewDevopsServer()

_, err := devopsServer.Build(context.Background(), nil)
if err == nil {
Expand All @@ -41,7 +41,7 @@ func TestDevops_Build_NilSpec(t *testing.T) {
func TestDevops_Build(t *testing.T) {
t.Skip("Skipping until we have the Validator system setup properly for testing.")
// TODO Cannot pass in nil to NewDevopsServer
devopsServer := NewDevopsServer(nil)
devopsServer := NewDevopsServer()

// Build the spec
chaincodePath := "github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01"
Expand All @@ -55,40 +55,3 @@ func TestDevops_Build(t *testing.T) {
t.Logf("Build result = %s", buildResult.ChaincodeSpec.ChaincodeID)
//performHandshake(t, peerClientConn)
}

func TestDevops_Deploy(t *testing.T) {
t.Skip("Skipping until we have the Validator system setup properly for testing.")
// TODO Cannot pass in nil to NewDevopsServer
devopsServer := NewDevopsServer(nil)

// Build the spec
chaincodePath := "github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01"
spec := &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG, ChaincodeID: &pb.ChaincodeID{Path: chaincodePath}}

buildResult, err := devopsServer.Deploy(context.Background(), spec)
if err != nil {
t.Fail()
t.Logf("Error in Devops.Build call: %s", err)
}
t.Logf("Deploy result = %s", buildResult.ChaincodeSpec)
//performHandshake(t, peerClientConn)
}

func TestDevops_Spec_NoVersion(t *testing.T) {
t.Skip("Skipping until we have the Validator system setup properly for testing.")
// TODO Cannot pass in nil to NewDevopsServer
devopsServer := NewDevopsServer(nil)

// Build the spec
chaincodePath := "github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01"
spec := &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG, ChaincodeID: &pb.ChaincodeID{Path: chaincodePath}}

buildResult, err := devopsServer.Deploy(context.Background(), spec)
if err == nil {
t.Fail()
t.Log("Expected error with no version specified")
return
}
t.Logf("Deploy result = %s, err = %s", buildResult, err)
//performHandshake(t, peerClientConn)
}
7 changes: 2 additions & 5 deletions core/endorser/endorser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/hyperledger/fabric/core/chaincode"
"github.com/hyperledger/fabric/core/ledger"
"github.com/hyperledger/fabric/core/ledger/kvledger"
"github.com/hyperledger/fabric/core/peer"
"github.com/hyperledger/fabric/msp"
"github.com/hyperledger/fabric/protos/common"
pb "github.com/hyperledger/fabric/protos/peer"
Expand All @@ -40,13 +39,11 @@ var endorserLogger = logging.MustGetLogger("endorser")

// Endorser provides the Endorser service ProcessProposal
type Endorser struct {
coord peer.MessageHandlerCoordinator
}

// NewEndorserServer creates and returns a new Endorser server instance.
func NewEndorserServer(coord peer.MessageHandlerCoordinator) pb.EndorserServer {
func NewEndorserServer() pb.EndorserServer {
e := new(Endorser)
e.coord = coord
return e
}

Expand Down Expand Up @@ -202,7 +199,7 @@ func (e *Endorser) endorseProposal(ctx context.Context, proposal *pb.Proposal, s

// marshalling event bytes
var err error
var eventBytes []byte = nil
var eventBytes []byte
if event != nil {
eventBytes, err = putils.GetBytesChaincodeEvent(event)
if err != nil {
Expand Down

0 comments on commit 0bd607a

Please sign in to comment.