rename AtomicTrade -> SimpleMarket

README.md

@@ -86,16 +86,16 @@ gulp deploy
 ## Gas Costs
 
 ```
-new AtomicTradeMorden:   909958 gas
-AtomicTradeMorden.offer: 140395-186235 gas
-AtomicTradeMorden.cancel: 33882 gas
-AtomicTradeMorden.buy:    49306-51707 gas
+new SimpleMarketMorden:   909958 gas
+SimpleMarketMorden.offer: 140395-186235 gas
+SimpleMarketMorden.cancel: 33882 gas
+SimpleMarketMorden.buy:    49306-51707 gas
 ```
 
 ## TODOs
 See https://waffle.io/MakerDAO/maker-otc
 
 ## Acknowledgements
-* Atomic Trade contract by [Nikolai Mushegian](https://github.com/nmushegian)
+* Simple Market contract by [Nikolai Mushegian](https://github.com/nmushegian)
 * User interface design by [Daniel Brockman](https://github.com/dbrock)
 * Blockchain Script by [Chris Hitchcott](https://github.com/hitchcott)

contracts/atomic_trade.sol → contracts/simple_market.sol

@@ -10,7 +10,7 @@ contract EventfulMarket {
     event Trade( uint sell_how_much, bytes32 indexed sell_which_token,
                  uint buy_how_much, bytes32 indexed buy_which_token );
 }
-contract AtomicTrade is MakerUser, EventfulMarket, FallbackFailer, Assertive {
+contract SimpleMarket is MakerUser, EventfulMarket, FallbackFailer, Assertive {
     struct OfferInfo {
         uint sell_how_much;
         bytes32 sell_which_token;
@@ -22,7 +22,7 @@ contract AtomicTrade is MakerUser, EventfulMarket, FallbackFailer, Assertive {
     uint public last_offer_id;
     mapping( uint => OfferInfo ) public offers;
 
-    function AtomicTrade( MakerUserLinkType registry )
+    function SimpleMarket( MakerUserLinkType registry )
              MakerUser( registry )
     {
     }
@@ -110,5 +110,5 @@ contract AtomicTrade is MakerUser, EventfulMarket, FallbackFailer, Assertive {
     }
 }
 
-contract AtomicTradeMainnet is AtomicTrade(MakerUserLinkType(0x0)) {}
-contract AtomicTradeMorden is AtomicTrade(MakerUserLinkType(0x1)) {}
+contract SimpleMarketMainnet is SimpleMarket(MakerUserLinkType(0x0)) {}
+contract SimpleMarketMorden is SimpleMarket(MakerUserLinkType(0x1)) {}

contracts/atomic_trade_test.sol → contracts/simple_market_test.sol

@@ -1,14 +1,14 @@
 import 'maker-user/user_test.sol';
-import 'atomic_trade.sol';
+import 'simple_market.sol';
 
-contract AtomicTradeTest is Test
+contract SimpleMarketTest is Test
                            , MakerUserGeneric(new MakerUserMockRegistry())
                            , EventfulMarket
 {
     MakerUserTester user1;
-    AtomicTrade otc;
+    SimpleMarket otc;
     function setUp() {
-        otc = new AtomicTrade(_M);
+        otc = new SimpleMarket(_M);
         user1 = new MakerUserTester(_M);
         user1._target(otc);
         transfer(user1, 100, "DAI");
@@ -23,7 +23,7 @@ contract AtomicTradeTest is Test
         var user1_dai_balance_before = balanceOf(user1, "DAI");
 
         var id = otc.offer( 30, "MKR", 100, "DAI" );
-        AtomicTrade(user1).buy(id);
+        SimpleMarket(user1).buy(id);
         var my_mkr_balance_after = balanceOf(this, "MKR");
         var my_dai_balance_after = balanceOf(this, "DAI");
         var user1_mkr_balance_after = balanceOf(user1, "MKR");
@@ -48,7 +48,7 @@ contract AtomicTradeTest is Test
         var user1_dai_balance_before = balanceOf(user1, "DAI");
 
         var id = otc.offer( 200, "MKR", 500, "DAI" );
-        AtomicTrade(user1).buyPartial(id, 10);
+        SimpleMarket(user1).buyPartial(id, 10);
         var my_mkr_balance_after = balanceOf(this, "MKR");
         var my_dai_balance_after = balanceOf(this, "DAI");
         var user1_mkr_balance_after = balanceOf(user1, "MKR");
@@ -78,13 +78,13 @@ contract AtomicTradeTest is Test
         var user1_dai_balance_before = balanceOf(user1, "DAI");
 
         var id = otc.offer( 500, "DAI", 200, "MKR" );
-        AtomicTrade(user1).buyPartial(id, 10);
+        SimpleMarket(user1).buyPartial(id, 10);
         var my_mkr_balance_after = balanceOf(this, "MKR");
         var my_dai_balance_after = balanceOf(this, "DAI");
         var user1_mkr_balance_after = balanceOf(user1, "MKR");
         var user1_dai_balance_after = balanceOf(user1, "DAI");
         var ( sell_val, sell_token, buy_val, buy_token ) = otc.getOffer(id);
-        
+
         assertEq( 500, my_dai_balance_before - my_dai_balance_after );
         assertEq( 4, my_mkr_balance_after - my_mkr_balance_before );
         assertEq( 10, user1_dai_balance_after - user1_dai_balance_before );
@@ -118,7 +118,7 @@ contract AtomicTradeTest is Test
         user1.doApprove(otc, 101, "DAI");
         log_named_uint("user1 dai allowance", allowance(user1, otc, "DAI"));
         log_named_uint("user1 dai balance before", balanceOf(user1, "DAI"));
-        AtomicTrade(user1).buy(id);
+        SimpleMarket(user1).buy(id);
         log_named_uint("user1 dai allowance", allowance(user1, otc, "DAI"));
         log_named_uint("user1 dai balance after", balanceOf(user1,"DAI"));
     }
@@ -129,7 +129,7 @@ contract AtomicTradeTest is Test
         user1.doApprove(otc, 99, "DAI");
         log_named_uint("user1 dai allowance", allowance(user1, otc, "DAI"));
         log_named_uint("user1 dai balance before", balanceOf(user1, "DAI"));
-        AtomicTrade(user1).buy(id);
+        SimpleMarket(user1).buy(id);
         log_named_uint("user1 dai allowance", allowance(user1, otc, "DAI"));
         log_named_uint("user1 dai balance after", balanceOf(user1,"DAI"));
     }

dappfile

@@ -12,5 +12,5 @@ environments:
   morden:
     objects:
       otc:
-        class: AtomicTradeMorden
+        class: SimpleMarketMorden
         address: '0xaaa17aff5a660f73baf140ee02ff805fb79fd845'

scripts/deploy_morden.ds

@@ -1,2 +1,2 @@
-var otc = new AtomicTradeMorden()
+var otc = new SimpleMarketMorden()
 export otc

scripts/deploy_private.ds

@@ -1,2 +1,2 @@
-var otc = new AtomicTrade("0x07d507a2ea2cef16dc01f4f5cabb778f768879ec")
+var otc = new SimpleMarket("0x07d507a2ea2cef16dc01f4f5cabb778f768879ec")
 export otc