annotation && v2proxy add gasreturn and trade incentive && proxyV2 incentive test

truffle-test.sh

@@ -3,35 +3,40 @@ truffle compile --all
 
 if [ "$1"x = "proxy-dpp"x ]
 then
-	truffle test ./test/Proxy/proxy.dpp.test.ts
+	truffle test ./test/V2Proxy/proxy.dpp.test.ts
 fi
  
 if [ "$1"x = "proxy-dvm"x ]
 then
-	truffle test ./test/Proxy/proxy.dvm.test.ts
+	truffle test ./test/V2Proxy/proxy.dvm.test.ts
 fi
 
 if [ "$1"x = "proxy-mix"x ]
 then
-	truffle test ./test/Proxy/proxy.mix.test.ts
+	truffle test ./test/V2Proxy/proxy.mix.test.ts
 fi
 
 if [ "$1"x = "proxy-classical"x ]
 then
-	truffle test ./test/Proxy/proxy.classical.test.ts
+	truffle test ./test/V2Proxy/proxy.classical.test.ts
 fi
 
 if [ "$1"x = "proxy-cp"x ]
 then
-	truffle test ./test/Proxy/proxy.cp.test.ts
+	truffle test ./test/V2Proxy/proxy.cp.test.ts
 fi
 
-if [ "$1"x = "route-incentive"x ]
+if [ "$1"x = "proxy-incentive"x ]
 then
-	truffle test ./test/Route/Incentive.test.ts
+	truffle test ./test/V2Proxy/proxy.incentive.test.ts
 fi
 
-if [ "$1"x = "route"x ]
-then
-	truffle test ./test/Route/route.test.ts
-fi
+# if [ "$1"x = "route-incentive"x ]
+# then
+# 	truffle test ./test/Route/Incentive.test.ts
+# fi
+
+# if [ "$1"x = "route"x ]
+# then
+# 	truffle test ./test/Route/route.test.ts
+# fi