Merge branch 'worry_free' into main

oracleNetworkProtocol · Jun 15, 2021 · 70114b7 · 70114b7
2 parents baf9b5b + 6e53d24
commit 70114b7
Show file tree

Hide file tree

Showing 12 changed files with 20,340 additions and 27,970 deletions.
diff --git a/README.md b/README.md
@@ -32,4 +32,9 @@ We have active, helpful communities on Twitter, Discord, and Telegram.
 
 * [Facebook](https://www.facebook.com/profile.php?id=100068750358187)
 * [Twitter](https://mobile.twitter.com/Plugchainclub)
-* [Telegram](https://t.me/plugchain)
+* [Telegram](https://t.me/plugchain)
+
+
+## Testnet Status
+
+See [doc](./testnet/README.md)
diff --git a/testutil/network/network.go → app/testutil/network/network.go b/testutil/network/network.go → app/testutil/network/network.go
diff --git a/testutil/simapp/simapp.go → app/testutil/simapp/simapp.go b/testutil/simapp/simapp.go → app/testutil/simapp/simapp.go
diff --git a/docs/index.tpl b/docs/index.tpl
@@ -5,27 +5,6 @@
         <title>{{ .Title }}</title>
         <link rel="stylesheet" type="text/css" href="//unpkg.com/[email protected]/swagger-ui.css" />
         <link rel="icon" href="data:image/ico;base64,aWNv">
-        <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
-
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
     </head>
     <body>
         <div id="swagger-ui"></div>