cur -> current

executor/exec.go

@@ -167,7 +167,7 @@ func MergeReceipt(r1 *types.Receipt, r2 *types.Receipt) (*types.Receipt, error)
 func getUnfreezeLog(prev, cur *pty.Unfreeze) *types.ReceiptLog {
 	log := &types.ReceiptLog{}
 	log.Ty = pty.TyLogCreateUnfreeze
-	r := &pty.ReceiptUnfreeze{Prev: prev, Cur: cur}
+	r := &pty.ReceiptUnfreeze{Prev: prev, Current: cur}
 	log.Log = types.Encode(r)
 	return log
 }

executor/exec_local.go

@@ -40,13 +40,13 @@ func (u *Unfreeze) ExecLocal_Terminate(payload *uf.UnfreezeTerminate, tx *types.
 }
 
 func localKeys(res *uf.ReceiptUnfreeze, value []byte) (kvs []*types.KeyValue) {
-	kvs = append(kvs, &types.KeyValue{initKey(res.Cur.Initiator), value})
-	kvs = append(kvs, &types.KeyValue{beneficiaryKey(res.Cur.Beneficiary), value})
+	kvs = append(kvs, &types.KeyValue{initKey(res.Current.Initiator), value})
+	kvs = append(kvs, &types.KeyValue{beneficiaryKey(res.Current.Beneficiary), value})
 	return
 }
 
 func (u *Unfreeze) saveUnfreezeCreate(res *uf.ReceiptUnfreeze) (kvs []*types.KeyValue) {
-	kvs = localKeys(res, []byte(res.Cur.UnfreezeID))
+	kvs = localKeys(res, []byte(res.Current.UnfreezeID))
 	return
 }
 

proto/unfreeze.proto

@@ -73,7 +73,7 @@ message UnfreezeTerminate {
 // receipt
 message ReceiptUnfreeze {
     Unfreeze prev = 1;
-    Unfreeze cur  = 2;
+    Unfreeze current  = 2;
 }
 
 // query

types/unfreeze.pb.go

@@ -653,7 +653,7 @@ func (m *UnfreezeTerminate) GetUnfreezeID() string {
 // receipt
 type ReceiptUnfreeze struct {
 	Prev    *Unfreeze `protobuf:"bytes,1,opt,name=prev" json:"prev,omitempty"`
-	Cur  *Unfreeze `protobuf:"bytes,2,opt,name=cur" json:"cur,omitempty"`
+	Current *Unfreeze `protobuf:"bytes,2,opt,name=current" json:"current,omitempty"`
 }
 
 func (m *ReceiptUnfreeze) Reset()                    { *m = ReceiptUnfreeze{} }
@@ -668,9 +668,9 @@ func (m *ReceiptUnfreeze) GetPrev() *Unfreeze {
 	return nil
 }
 
-func (m *ReceiptUnfreeze) GetCur() *Unfreeze {
+func (m *ReceiptUnfreeze) GetCurrent() *Unfreeze {
 	if m != nil {
-		return m.Cur
+		return m.Current
 	}
 	return nil
 }
@@ -732,40 +732,40 @@ func init() {
 func init() { proto.RegisterFile("unfreeze.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 556 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5d, 0x8f, 0xd2, 0x40,
-	0x14, 0xa5, 0x94, 0x02, 0xbd, 0x44, 0x58, 0x27, 0xae, 0x36, 0xc6, 0x18, 0xac, 0x3e, 0xf0, 0x84,
-	0x86, 0x8d, 0xd1, 0xc4, 0x07, 0xc3, 0xae, 0x1a, 0x4c, 0x8c, 0x1f, 0x15, 0x63, 0x7c, 0x1c, 0xca,
-	0x45, 0x26, 0x69, 0x67, 0x9a, 0xe9, 0x94, 0xdd, 0xfa, 0x57, 0xfc, 0x3d, 0x3e, 0xf9, 0xa7, 0x4c,
-	0xa7, 0xa5, 0x40, 0xc9, 0x4a, 0x96, 0xc7, 0x39, 0xe7, 0x9e, 0x73, 0xef, 0xf4, 0x9e, 0x0e, 0x74,
-	0x13, 0xbe, 0x90, 0x88, 0xbf, 0x70, 0x18, 0x49, 0xa1, 0x04, 0xb1, 0x54, 0x1a, 0x61, 0xec, 0xfe,
-	0x36, 0xa1, 0xfd, 0xad, 0x60, 0xc8, 0x43, 0x80, 0x75, 0xd5, 0xfb, 0x37, 0x8e, 0xd1, 0x37, 0x06,
-	0xb6, 0xb7, 0x85, 0x90, 0x07, 0x60, 0xc7, 0x8a, 0x4a, 0x35, 0x65, 0x21, 0x3a, 0xf5, 0xbe, 0x31,
-	0x30, 0xbd, 0x0d, 0x90, 0xb1, 0x34, 0x8e, 0x51, 0xbd, 0xbd, 0x42, 0xdf, 0x31, 0xb5, 0x78, 0x03,
-	0x90, 0x3e, 0x74, 0xf4, 0xe1, 0x6b, 0x1a, 0xce, 0x44, 0xe0, 0x34, 0x34, 0xbf, 0x0d, 0x65, 0xdd,
-	0x95, 0x50, 0x34, 0xb8, 0x10, 0x09, 0x57, 0x8e, 0xa5, 0xed, 0xb7, 0x90, 0xcc, 0x9f, 0x71, 0xa6,
-	0x18, 0x55, 0x42, 0x3a, 0xcd, 0xdc, 0xbf, 0x04, 0x32, 0xff, 0x19, 0x72, 0x5c, 0x30, 0x9f, 0x51,
-	0x99, 0x3a, 0xad, 0xdc, 0x7f, 0x0b, 0xca, 0xf4, 0x12, 0x43, 0xca, 0x38, 0xe3, 0x3f, 0x9d, 0x76,
-	0x3e, 0x7d, 0x09, 0x90, 0x3b, 0x60, 0x85, 0x48, 0x79, 0xec, 0xd8, 0x5a, 0x99, 0x1f, 0xc8, 0x33,
-	0xb0, 0x17, 0xec, 0x6a, 0x1c, 0xea, 0x91, 0xa0, 0x6f, 0x0c, 0x3a, 0xa3, 0x93, 0xa1, 0xfe, 0x72,
-	0xc3, 0x77, 0x6b, 0x7c, 0x52, 0xf3, 0x36, 0x45, 0xe4, 0x35, 0x74, 0x03, 0x5c, 0xa8, 0xcf, 0x52,
-	0x44, 0x42, 0x2a, 0x26, 0xb8, 0xd3, 0xd1, 0xb2, 0xd3, 0x42, 0xf6, 0x61, 0x87, 0x9c, 0xd4, 0xbc,
-	0x4a, 0xf9, 0x39, 0x40, 0x5b, 0xf7, 0xfe, 0x14, 0x29, 0xf7, 0x15, 0xd8, 0x65, 0x1b, 0x72, 0x17,
-	0x9a, 0x11, 0x4a, 0x26, 0xe6, 0x7a, 0x33, 0xa6, 0x57, 0x9c, 0x32, 0x9c, 0xe6, 0x03, 0xe6, 0x2b,
-	0x29, 0x4e, 0xee, 0x47, 0xe8, 0xee, 0x36, 0xbb, 0xd6, 0xe1, 0x09, 0xdc, 0x52, 0xc8, 0xa7, 0x4b,
-	0x91, 0xc4, 0x94, 0xcf, 0xd5, 0xb2, 0x30, 0xda, 0x05, 0xdd, 0xbf, 0x06, 0x74, 0xd7, 0x51, 0x19,
-	0xfb, 0xda, 0xf0, 0x29, 0x34, 0x7d, 0x89, 0x54, 0xa1, 0x36, 0xdc, 0x5c, 0x72, 0x5d, 0x76, 0xa1,
-	0xc9, 0x49, 0xcd, 0x2b, 0xca, 0xc8, 0x73, 0x68, 0x5f, 0x32, 0xb5, 0x9c, 0x4b, 0x7a, 0xa9, 0x9b,
-	0x74, 0x46, 0xf7, 0x2a, 0x92, 0xef, 0x05, 0x3d, 0xa9, 0x79, 0x65, 0x29, 0x79, 0x09, 0xb6, 0x42,
-	0x19, 0x32, 0x9e, 0xb5, 0x32, 0xb5, 0xce, 0xa9, 0xe8, 0xa6, 0x6b, 0x3e, 0x5b, 0x47, 0x59, 0x4c,
-	0xba, 0x50, 0x57, 0xa9, 0x4e, 0x9b, 0xe5, 0xd5, 0x55, 0x7a, 0xde, 0x02, 0x6b, 0x45, 0x83, 0x04,
-	0xdd, 0x3f, 0xf5, 0xcd, 0x6d, 0xf2, 0x31, 0x77, 0xe3, 0x6d, 0xfc, 0x37, 0xde, 0xf5, 0x03, 0xf1,
-	0x36, 0x0f, 0xc5, 0xbb, 0xb1, 0x17, 0xef, 0x4a, 0x80, 0xad, 0xfd, 0x00, 0x97, 0x11, 0x6d, 0x5e,
-	0x1b, 0xd1, 0xd6, 0x71, 0x11, 0x6d, 0x1f, 0x1f, 0xd1, 0x11, 0x9c, 0x54, 0x57, 0x77, 0xe8, 0x1d,
-	0x71, 0xcf, 0xe0, 0xf6, 0xde, 0xda, 0x0e, 0x8a, 0x7e, 0x40, 0xcf, 0x43, 0x1f, 0x59, 0xa4, 0xca,
-	0xf7, 0xea, 0x31, 0x34, 0x22, 0x89, 0xab, 0x22, 0x7c, 0xbd, 0x4a, 0x22, 0x3c, 0x4d, 0x92, 0x47,
-	0x60, 0xfa, 0x89, 0x2c, 0xd2, 0xb6, 0x57, 0x93, 0x71, 0xee, 0x0b, 0x38, 0xfd, 0x92, 0xa0, 0x4c,
-	0x6f, 0x7c, 0x91, 0x05, 0xdc, 0xf7, 0x30, 0x0a, 0xd2, 0xa3, 0xd4, 0x64, 0x00, 0x3d, 0xba, 0xa2,
-	0x2c, 0xa0, 0xb3, 0x00, 0xc7, 0xdb, 0x7f, 0x70, 0x15, 0x9e, 0x35, 0xf5, 0x9b, 0x7d, 0xf6, 0x2f,
-	0x00, 0x00, 0xff, 0xff, 0xa6, 0x5c, 0xce, 0xc4, 0xc5, 0x05, 0x00, 0x00,
+	// 559 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x8f, 0xd2, 0x4e,
+	0x14, 0xa5, 0x74, 0x0b, 0xf4, 0x92, 0x1f, 0xec, 0x6f, 0xe2, 0x6a, 0x63, 0x8c, 0x21, 0xd5, 0x07,
+	0x7c, 0x41, 0xc3, 0xc6, 0x68, 0xe2, 0x83, 0x61, 0x57, 0x0d, 0x26, 0xc6, 0x3f, 0x15, 0xe3, 0xf3,
+	0x50, 0x2e, 0x32, 0x49, 0x3b, 0xd3, 0x4c, 0xa7, 0xec, 0xd6, 0xaf, 0xe2, 0xe7, 0xf1, 0xc9, 0x2f,
+	0x65, 0x3a, 0xfd, 0x03, 0x14, 0x57, 0x22, 0x8f, 0x73, 0xce, 0x3d, 0xe7, 0xde, 0xe9, 0x3d, 0x1d,
+	0xe8, 0x25, 0x7c, 0x29, 0x11, 0xbf, 0xe3, 0x28, 0x92, 0x42, 0x09, 0x62, 0xa9, 0x34, 0xc2, 0xd8,
+	0xfd, 0x61, 0x42, 0xe7, 0x4b, 0xc1, 0x90, 0xfb, 0x00, 0x65, 0xd5, 0xdb, 0x57, 0x8e, 0x31, 0x30,
+	0x86, 0xb6, 0xb7, 0x85, 0x90, 0x7b, 0x60, 0xc7, 0x8a, 0x4a, 0x35, 0x63, 0x21, 0x3a, 0xcd, 0x81,
+	0x31, 0x34, 0xbd, 0x0d, 0x90, 0xb1, 0x34, 0x8e, 0x51, 0xbd, 0xbe, 0x46, 0xdf, 0x31, 0xb5, 0x78,
+	0x03, 0x90, 0x01, 0x74, 0xf5, 0xe1, 0x73, 0x1a, 0xce, 0x45, 0xe0, 0x9c, 0x68, 0x7e, 0x1b, 0xca,
+	0xba, 0x2b, 0xa1, 0x68, 0x70, 0x29, 0x12, 0xae, 0x1c, 0x4b, 0xdb, 0x6f, 0x21, 0x99, 0x3f, 0xe3,
+	0x4c, 0x31, 0xaa, 0x84, 0x74, 0x5a, 0xb9, 0x7f, 0x05, 0x64, 0xfe, 0x73, 0xe4, 0xb8, 0x64, 0x3e,
+	0xa3, 0x32, 0x75, 0xda, 0xb9, 0xff, 0x16, 0x94, 0xe9, 0x25, 0x86, 0x94, 0x71, 0xc6, 0xbf, 0x39,
+	0x9d, 0x7c, 0xfa, 0x0a, 0x20, 0xb7, 0xc0, 0x0a, 0x91, 0xf2, 0xd8, 0xb1, 0xb5, 0x32, 0x3f, 0x90,
+	0x27, 0x60, 0x2f, 0xd9, 0xf5, 0x24, 0xd4, 0x23, 0xc1, 0xc0, 0x18, 0x76, 0xc7, 0xa7, 0x23, 0xfd,
+	0xe5, 0x46, 0x6f, 0x4a, 0x7c, 0xda, 0xf0, 0x36, 0x45, 0xe4, 0x25, 0xf4, 0x02, 0x5c, 0xaa, 0x8f,
+	0x52, 0x44, 0x42, 0x2a, 0x26, 0xb8, 0xd3, 0xd5, 0xb2, 0xb3, 0x42, 0xf6, 0x6e, 0x87, 0x9c, 0x36,
+	0xbc, 0x5a, 0xf9, 0x05, 0x40, 0x47, 0xf7, 0xfe, 0x10, 0x29, 0xf7, 0x05, 0xd8, 0x55, 0x1b, 0x72,
+	0x1b, 0x5a, 0x11, 0x4a, 0x26, 0x16, 0x7a, 0x33, 0xa6, 0x57, 0x9c, 0x32, 0x9c, 0xe6, 0x03, 0xe6,
+	0x2b, 0x29, 0x4e, 0xee, 0x7b, 0xe8, 0xed, 0x36, 0xbb, 0xd1, 0xe1, 0x21, 0xfc, 0xa7, 0x90, 0xcf,
+	0x56, 0x22, 0x89, 0x29, 0x5f, 0xa8, 0x55, 0x61, 0xb4, 0x0b, 0xba, 0xbf, 0x0c, 0xe8, 0x95, 0x51,
+	0x99, 0xf8, 0xda, 0xf0, 0x31, 0xb4, 0x7c, 0x89, 0x54, 0xa1, 0x36, 0xdc, 0x5c, 0xb2, 0x2c, 0xbb,
+	0xd4, 0xe4, 0xb4, 0xe1, 0x15, 0x65, 0xe4, 0x29, 0x74, 0xae, 0x98, 0x5a, 0x2d, 0x24, 0xbd, 0xd2,
+	0x4d, 0xba, 0xe3, 0x3b, 0x35, 0xc9, 0xd7, 0x82, 0x9e, 0x36, 0xbc, 0xaa, 0x94, 0x3c, 0x07, 0x5b,
+	0xa1, 0x0c, 0x19, 0xcf, 0x5a, 0x99, 0x5a, 0xe7, 0xd4, 0x74, 0xb3, 0x92, 0xcf, 0xd6, 0x51, 0x15,
+	0x93, 0x1e, 0x34, 0x55, 0xaa, 0xd3, 0x66, 0x79, 0x4d, 0x95, 0x5e, 0xb4, 0xc1, 0x5a, 0xd3, 0x20,
+	0x41, 0xf7, 0x67, 0x73, 0x73, 0x9b, 0x7c, 0xcc, 0xdd, 0x78, 0x1b, 0x7f, 0x8d, 0x77, 0xf3, 0x40,
+	0xbc, 0xcd, 0x43, 0xf1, 0x3e, 0xd9, 0x8b, 0x77, 0x2d, 0xc0, 0xd6, 0x7e, 0x80, 0xab, 0x88, 0xb6,
+	0x6e, 0x8c, 0x68, 0xfb, 0xb8, 0x88, 0x76, 0x8e, 0x8f, 0xe8, 0x18, 0x4e, 0xeb, 0xab, 0x3b, 0xf4,
+	0x8e, 0xb8, 0xe7, 0xf0, 0xff, 0xde, 0xda, 0x0e, 0x8a, 0x28, 0xf4, 0x3d, 0xf4, 0x91, 0x45, 0xaa,
+	0x7a, 0xaf, 0x1e, 0xc0, 0x49, 0x24, 0x71, 0x5d, 0x84, 0xaf, 0x5f, 0x4b, 0x84, 0xa7, 0x49, 0xf2,
+	0x08, 0xda, 0x7e, 0x22, 0x25, 0x16, 0xff, 0xc7, 0x1f, 0xea, 0x4a, 0xde, 0x7d, 0x06, 0x67, 0x9f,
+	0x12, 0x94, 0xe9, 0x3f, 0x5f, 0x68, 0x09, 0x77, 0x3d, 0x8c, 0x82, 0xf4, 0x28, 0x35, 0x19, 0x42,
+	0x9f, 0xae, 0x29, 0x0b, 0xe8, 0x3c, 0xc0, 0xc9, 0xf6, 0x9f, 0x5c, 0x87, 0xe7, 0x2d, 0xfd, 0x76,
+	0x9f, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x7b, 0x83, 0xa7, 0xcd, 0x05, 0x00, 0x00,
 }