From 75260552ed9a8abbbc1d7f4c28f85348235ff231 Mon Sep 17 00:00:00 2001
From: Denys Zadorozhnyi <denys@zadorozhnyi.com>
Date: Thu, 21 Feb 2019 11:48:41 +0200
Subject: [PATCH] fix build after rebase;

---
 src/main/scala/sigmastate/eval/RuntimeCosting.scala   |  4 ++--
 .../sigmastate/helpers/SigmaTestingCommons.scala      | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/sigmastate/eval/RuntimeCosting.scala b/src/main/scala/sigmastate/eval/RuntimeCosting.scala
index 8afe266e7f..dcd73968b7 100644
--- a/src/main/scala/sigmastate/eval/RuntimeCosting.scala
+++ b/src/main/scala/sigmastate/eval/RuntimeCosting.scala
@@ -1569,7 +1569,7 @@ trait RuntimeCosting extends SigmaLibrary with DataCosting with Slicing { IR: Ev
         val res = sigmaDslBuilder.decodePoint(bytes.values)
         withDefaultSize(res, costOf(node))
 
-      case Terms.MethodCall(obj, method, args) if obj.tpe.isCollectionLike =>
+      case Terms.MethodCall(obj, method, args, _) if obj.tpe.isCollectionLike =>
         val xsC = asRep[CostedColl[Any]](evalNode(ctx, env, obj))
         val (argsVals, argsCosts) = args.map {
           case sfunc: Value[SFunc]@unchecked if sfunc.tpe.isFunc =>
@@ -1606,7 +1606,7 @@ trait RuntimeCosting extends SigmaLibrary with DataCosting with Slicing { IR: Ev
         }
         withDefaultSize(value, cost)
 
-      case Terms.MethodCall(obj, method, args) if obj.tpe.isOption =>
+      case Terms.MethodCall(obj, method, args, _) if obj.tpe.isOption =>
         val optC = asRep[CostedOption[Any]](eval(obj))
         val argsC = args.map(eval)
         (method.name, argsC) match {
diff --git a/src/test/scala/sigmastate/helpers/SigmaTestingCommons.scala b/src/test/scala/sigmastate/helpers/SigmaTestingCommons.scala
index f2dfb3c700..73f94771b8 100644
--- a/src/test/scala/sigmastate/helpers/SigmaTestingCommons.scala
+++ b/src/test/scala/sigmastate/helpers/SigmaTestingCommons.scala
@@ -1,15 +1,15 @@
 package sigmastate.helpers
 
 import org.ergoplatform.ErgoAddressEncoder.TestnetNetworkPrefix
-import org.ergoplatform.{ErgoLikeContext, ErgoAddressEncoder, ErgoBox, ErgoScriptPredef}
+import org.ergoplatform.{ErgoAddressEncoder, ErgoBox, ErgoLikeContext, ErgoScriptPredef}
 import org.ergoplatform.ErgoBox.{NonMandatoryRegisterId, TokenId}
 import org.ergoplatform.ErgoScriptPredef.TrueProp
 import org.scalatest.prop.{GeneratorDrivenPropertyChecks, PropertyChecks}
 import org.scalatest.{Matchers, PropSpec}
 import scorex.crypto.hash.Blake2b256
 import scorex.util._
-import sigmastate.Values.{Constant, EvaluatedValue, SValue, TrueLeaf, Value, ErgoTree, GroupElementConstant}
-import sigmastate.eval.{CompiletimeCosting, IRContext, Evaluation}
+import sigmastate.Values.{Constant, ErgoTree, EvaluatedValue, GroupElementConstant, SValue, TrueLeaf, Value}
+import sigmastate.eval.{CompiletimeCosting, Evaluation, IRContext}
 import sigmastate.interpreter.{CryptoConstants, Interpreter}
 import sigmastate.interpreter.Interpreter.{ScriptEnv, ScriptNameProp}
 import sigmastate.lang.{SigmaCompiler, TransformingSigmaBuilder}
@@ -17,8 +17,9 @@ import sigmastate.{SBoolean, SGroupElement, SType}
 
 import scala.annotation.tailrec
 import scala.language.implicitConversions
-import scalan.{TestUtils, TestContexts, Nullable, RType}
-import sigma.types.{PrimViewType, IsPrimView, View}
+import scalan.{Nullable, RType, TestContexts, TestUtils}
+import sigma.types.{IsPrimView, PrimViewType, View}
+import sigmastate.serialization.ErgoTreeSerializer
 import spire.util.Opt
 
 trait SigmaTestingCommons extends PropSpec